47 files changed, 84821 insertions, 65689 deletions

diff --git a/ChangeLog b/ChangeLog
index edbb1f2d7e..1915e6f66a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
+
+	* configure.in: 1.1.2.  Update deps for GAL and GtkHTML.
+
 2002-09-27  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.am (SUBDIRS): Add m4.
diff --git a/NEWS b/NEWS
index cae8d4376e..5c5ebf65d0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,12 +3,34 @@ Evolution 1.1.2, 2002-10-07
 
 Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
 
+  * Addressbook
+
+    #17336 -- Evolution mixes up First and Last names sometimes.
+              (Toshok)
+    #27521 -- Crash: exiting from evolution after adding to address
+              book.  (Toshok)
+    #28165 -- Contacts crashed when selecting offline IMAP folders.
+              (Toshok)
+    #28392 -- Crash when adding a new contact.  (Toshok)
+    #30208 -- LDAP authentication issues.  (Toshok)
+    #30481 -- Select contacts dialog not using default contact folder.
+              (Toshok)
+    #30483 -- LDAP folders do not work as an autocompletion folder.
+              (Toshok)
+    #31321 -- Missing VERSION property in exported vCards.  (Toshok)
+    #31434 -- Only sends email to first three addresses on contact
+              list.  (Toshok)
+    #29171 -- Crash after selecting other user's folder for Offline.
+              (Toshok)
+    #30250 -- Addressbook crashes or hangs after selecting LDAP
+              folder.  (Toshok)
+
   * Calendar
 
-    #14111 -- Gives 'are you sure you want to' prompt when no such
-              action has occurred.
+    #14111 -- Gives "are you sure you want to" prompt when no such
+              action has occurred.  (JP)
     #15710 -- Automatically-created reminder always says "Untitled
-              Appointment".
+              Appointment".  (Rodrigo)
     #15892 -- Running out of disk space can cause loss of calender
               entries and tasks.  (Rodrigo)
     #18162 -- Double-click on calendar week/month view shouldn't do
@@ -25,6 +47,8 @@ Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
     #30290 -- Importer Not Ready when importing .ics Ical file.
               (Rodrigo)
     #30381 -- Calendar recurrences "off-by-one".  (JP)
+    #31774 -- Reselecting options for remider crashes calendar.
+              (Rodrigo)
 
   * Conduits
 
@@ -150,14 +174,15 @@ Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
 
 Other fixes:
 
+  * Addressbook
+
+    - Fixed some memory leaks.  (Toshok)
+
   * Calendar
 
     - Do not allow empty attendee addresses for meetings.  (JP)
-
     - Better alarm daemon activation.  (Rodrigo)
-
     - Notification of calendar query errors.  (Rodrigo)
-
     - Added status messages for all operations.  (Rodrigo)
 
   * Conduits
@@ -168,17 +193,12 @@ Other fixes:
 
     - Some strings that were not translated properly before now are.
       (Kjartan Maraas)
-
     - Sensitivity problem when using the folder selector.  (Toshok)
-
     - Changed the way shared folders work with Connector.  (Dan)
-
     - Allow accessing local folders even if some folders with
       unknown/corrupted metadata type are found in ~/evolution/local.
       (Ettore)
-
-    - Importer dialog now has history support.  (Rodrigo)
-
+    - Importer dialog browse entry now has history dropdown.  (Rodrigo)
     - We no longer allow selecting a folder of a non-allowed type with
       a double-click in the folder selection dialog.  (Dan)
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de66da341e..0993815312 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+FIXME: http://bugzilla.ximian.com/show_bug.cgi?id=31896
+
 WARNING
 
 Evolution 1.1.1 is a BETA quality release.  This means that it has
diff --git a/art/ChangeLog b/art/ChangeLog
index 50a66148bf..811bad7072 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
+
+	* splash.png: New artwork from Jakub.
+
 2002-09-27  Dan Winship  <danw@ximian.com>
 
 	* post-reply-24.png: New icon for "Post a Reply" from Jakub.
diff --git a/art/splash.png b/art/splash.png
index 05f4da9259..4e98b8298c 100644
--- a/art/splash.png
+++ b/art/splash.png
diff --git a/configure.in b/configure.in
index 0e19104237..d2318d6410 100644
--- a/configure.in
+++ b/configure.in
@@ -19,9 +19,9 @@ fi
 
 EVOLUTION_MAJOR_VERSION=1
 EVOLUTION_MINOR_VERSION=1
-EVOLUTION_MICRO_VERSION=1
-EVOLUTION_NANO_VERSION=99
-VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION.$EVOLUTION_NANO_VERSION
+EVOLUTION_MICRO_VERSION=2
+EVOLUTION_NANO_VERSION=0
+VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
 PACKAGE=evolution
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -578,8 +578,8 @@ EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0.5)
 EVO_CHECK_LIB(libxml, xml, 1.8.17, 2.0)
 EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11)
 
-EVO_CHECK_LIB(GAL, gal, 0.20)
-PKG_CHECK_MODULES(GTKHTML, gtkhtml-1.1)
+EVO_CHECK_LIB(GAL, gal, 0.20.1)
+PKG_CHECK_MODULES(GTKHTML, gtkhtml-1.1 >= 1.1.4)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir gtkhtml-1.1`
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
index 28eeb19875..68bfef1c1a 100644
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -167,6 +167,16 @@ CalClient *client
 CalClient *client
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_is_read_only</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_email_address</NAME>
+<RETURNS>const char  *</RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_set_mode</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, CalMode mode
@@ -352,7 +362,7 @@ typedef struct {
 <NAME>QueryListenerObjUpdatedFn</NAME>
 <RETURNS>void </RETURNS>
 QueryListener *ql,
-					    const GNOME_Evolution_Calendar_CalObjUID uid,
+					    const GNOME_Evolution_Calendar_CalObjUIDSeq *uids,
 					    CORBA_boolean query_in_progress,
 					    CORBA_long n_scanned,
 					    CORBA_long total,
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index db73904ce0..d18b00bc36 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -4,34 +4,17 @@ char *s = N_("Assign Color");
 char *s = N_("Assign Score");
 char *s = N_("Attachments");
 char *s = N_("Beep");
-char *s = N_("contains");
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
 char *s = N_("Deleted");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not return");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
 char *s = N_("Do Not Exist");
 char *s = N_("Draft");
-char *s = N_("ends with");
 char *s = N_("Exist");
-char *s = N_("exists");
 char *s = N_("Expression");
 char *s = N_("Follow Up");
 char *s = N_("Important");
-char *s = N_("is");
-char *s = N_("is after");
-char *s = N_("is before");
-char *s = N_("is Flagged");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is not Flagged");
 char *s = N_("Label");
 char *s = N_("Mailing list");
 char *s = N_("Message Body");
@@ -43,20 +26,37 @@ char *s = N_("Read");
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
 char *s = N_("Replied to");
-char *s = N_("returns");
-char *s = N_("returns greater than");
-char *s = N_("returns less than");
 char *s = N_("Run Once");
 char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Status");
 char *s = N_("Shell Command");
 char *s = N_("Size (kB)");
-char *s = N_("sounds like");
 char *s = N_("Source Account");
 char *s = N_("Specific header");
-char *s = N_("starts with");
 char *s = N_("Status");
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
 char *s = N_("Unset Status");
+char *s = N_("contains");
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not return");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+char *s = N_("is Flagged");
+char *s = N_("is after");
+char *s = N_("is before");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not Flagged");
+char *s = N_("is not");
+char *s = N_("is");
+char *s = N_("returns greater than");
+char *s = N_("returns less than");
+char *s = N_("returns");
+char *s = N_("sounds like");
+char *s = N_("starts with");
diff --git a/po/ChangeLog b/po/ChangeLog
index 04ca29f7eb..bc6acdde85 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,19 @@
+2002-10-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-10-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-10-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-10-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
 2002-10-04  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/az.po b/po/az.po
index a22a90c100..9a358bb58c 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-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"
@@ -319,11 +319,17 @@ msgstr "Soyad"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: 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:2681
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
@@ -334,47 +340,47 @@ msgstr "%s üçün VCard"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Axtarılır..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Yüklənir ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP vericiyə bağlantı qurulur..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "LDAP vericiyə kart əlavə edilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "LDAP vericidən kart çıxardılır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP vericidəki kart təkmilləşdirilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "LDAP axtarış nəticələri alınır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kart çıxartma xətası"
@@ -393,13 +399,13 @@ msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 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:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
@@ -466,10 +472,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Nümunəvi ünvan dəftəri idarəsi emalatxanası"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Əlaqələr"
@@ -486,29 +492,39 @@ msgstr "LDAP Vericisi"
 msgid "LDAP server containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Əlaqələr"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, 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
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Yeni bir hesab yarat"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Yeni bir əlaqə siyahısı yarat"
@@ -557,7 +573,7 @@ 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-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: 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"
 
@@ -565,11 +581,11 @@ msgstr "gnome-vfs-ni başlada bilmədim"
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook.c:471
+#: 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:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -577,7 +593,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:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -587,7 +603,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:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -599,7 +615,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:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -609,38 +625,51 @@ 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:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"IMAP vericisinə tanıdılma xətası.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "%s üçün parol girin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateqoriya"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -648,7 +677,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -656,25 +685,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
@@ -741,53 +770,53 @@ msgid "  S_how Supported Bases "
 msgstr " Dəstəklənən növləri _yoxla "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Seçənəklər"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _Sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Sil"
+
+#: 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 ""
@@ -924,48 +953,54 @@ msgstr "Bir"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, 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:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Hamısını Seç"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Silinən"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -976,7 +1011,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -985,47 +1020,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Mənbə Məlumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Baz."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Dəstəklənməyən sxem"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1033,7 +1068,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1042,7 +1077,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1050,7 +1085,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1060,7 +1095,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1070,27 +1105,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1098,7 +1133,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1106,11 +1141,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1119,25 +1154,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1145,49 +1180,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Gediş əlavə et"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Gediş əlavə et"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Hamısını _Sil"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Ekran"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1197,102 +1232,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Görüşü _düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Alarmı"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Seçənəklər"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Qapı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Axtarış ə_sası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Hesab %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Axtarılır"
@@ -1307,8 +1342,8 @@ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1339,11 +1374,11 @@ msgstr "(%d göstərilmir)"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 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:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "Daxil edən yollayıcılar"
@@ -1422,7 +1457,7 @@ msgid "D_epartment:"
 msgstr "_Bölmə :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Ətraflı"
 
@@ -1486,13 +1521,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -1520,1028 +1555,1028 @@ msgstr "_Ümumi Təqvim URL:"
 msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Əfqanıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Əlcəzair"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikan Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Anqola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anquilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antiq Və Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: 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:141
 msgid "Armenia"
 msgstr "Ermənistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Avstriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azərbaycan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahreyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Banqladeş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Belarusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belçika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Beliz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosniya Və Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botsvana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Buvet Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Braziliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Britaniya Hind Okeanı Sahəsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Bruney Darüssəlim"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bolqariya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambodiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: 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:169
 msgid "Cape Verde"
 msgstr "Keyp Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kayman Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Mərkəzi Afrika Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Çad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Çili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Çin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Kristmas Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komor"
 
-#: 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
 msgid "Congo"
 msgstr "Konqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Kuku Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Kot Divuar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Xırvatıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: 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:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kipr (Yunan və Türk) "
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Cibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikan Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Şərqi Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: 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:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Misir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "Elsalvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Efiopiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Folkland Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Faro Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fici"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Fransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Fransız Gvineyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Fransız Poloneziyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Cənubi Fransız Sahələri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Qabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Qambiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gürcüstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Almanya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Qana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Yunanıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Qrinland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Qrenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Quadelup"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Quam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Quatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Quyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Herd Və McDonald Adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Müqəddəs Dəniz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Honq Konq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Macarıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "İslandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Hindistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "İndoneziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "İrlandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "İsrail"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "İtaliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Yamayka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "İordaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Qazaxıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Koreya Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Küveyt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Qırğızıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Latviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Livan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Lixtenşteyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lüksemburq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Makau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Makedoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madaqaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malavi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malayziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldiv"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Marşal Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martiniq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mavritaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Maurit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayot"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikroneziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Monqolustan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Mərakeş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambiq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Holland Antilləri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Yeni Kaledoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Yeni Zellandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaraqua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "Şimali Marian Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norveç"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Fələstin Bölgəsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Yeni Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraqvay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filippin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitkairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polşa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reyunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Ruminıya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Rusiya Federasiyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Rvanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Müqəddəs Kits Və Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Müqəddəs Lusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 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:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome Və Prinsip"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Səudiyyə Ərəbistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Seneqal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seyşel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Siera Lione"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Sinqapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Sloveniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Solomon Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Cənubi Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 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:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "İspaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Şri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "Müqəddəs Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "Müqəddəs Pyer Və Mikuelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard Və Xuan Mayen Adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Svaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "İsveç"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "İsveçrə"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tacikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Birləşmiş Tanzaniya Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tayland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Toqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonqa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad Və Tobaqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Türkiyə"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Türkmənistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Türk Və Kaykos Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uqanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrayna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "Birləşmiş Ştatlar yanı Kiçik Adalar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruqvay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Özbəkistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vyetnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "A.B.Ş. Virgin adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "A.B.Ş. Virgin adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Vallis Və Futuna Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Qərbi Saxara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yəmən"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yuqoslaviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
@@ -2578,20 +2613,20 @@ msgstr "TTY/TDD"
 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "ePoçt"
 
@@ -2613,6 +2648,19 @@ 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Faylının üsütünə yazım mı?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Ünvan _2:"
@@ -2744,7 +2792,7 @@ msgstr "əlaqə-siyahısı-editoru"
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -2795,7 +2843,7 @@ msgstr ""
 "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:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
@@ -2804,25 +2852,25 @@ msgstr "Ətraflı Axtarış"
 msgid "Search"
 msgstr "Axtar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2834,10 +2882,10 @@ msgid "Success"
 msgstr "Müvəffəqiyyət"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -2845,7 +2893,7 @@ msgstr "Naməlum xəta"
 msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Qadağandır"
@@ -2866,8 +2914,8 @@ msgstr "Protokol dəstəklənmir"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
@@ -2918,7 +2966,7 @@ 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:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
@@ -2935,9 +2983,8 @@ msgstr "Ekran"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3027,7 +3074,7 @@ msgstr "Ünvan Dəftəri"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -3113,7 +3160,7 @@ msgstr "Köçürt"
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3121,8 +3168,8 @@ msgstr "Yapışdır"
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_Hazırkı Görünüş"
@@ -3131,7 +3178,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3139,11 +3186,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3279,7 +3326,7 @@ msgid "Include:"
 msgstr "Daxil et :"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Mənzərə"
 
@@ -3304,7 +3351,7 @@ msgid "Options"
 msgstr "Seçənəklər"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "İstiqamət"
 
@@ -3327,7 +3374,7 @@ msgstr "Kağız qaynağı :"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portret"
 
@@ -3389,20 +3436,20 @@ msgstr "Adsız görüş"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 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:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Alçaq"
 
@@ -3413,13 +3460,17 @@ msgstr "Alçaq"
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 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:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
@@ -3532,11 +3583,11 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3548,13 +3599,13 @@ msgstr ""
 "üçün qurulubdur.  Evolution yerinə normal\n"
 "xatırlatma ekranı göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3571,16 +3622,16 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
@@ -3629,7 +3680,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3708,9 +3759,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3727,13 +3778,13 @@ msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Bəli"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Xeyr"
 
@@ -3753,82 +3804,102 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: 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:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Vəzifə"
 
-#: calendar/gui/component-factory.c:75
+#: 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:709
+#: 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:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Yeni bir iclas yarat"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Xəbərlər Qurğuları"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Yeni bir vəzifə yarat"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Yeni bir vəzifə yarat"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir iclas yarat"
@@ -3871,29 +3942,30 @@ 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:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Səs çal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Alarmı təkrarla"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Proqramı işə sal: "
 
-#: 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 ""
-"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:7
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
@@ -3917,110 +3989,110 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d gün"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 gün"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyə"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 saniyə"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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:377
+#: 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:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "ePoçt göndər"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:391
+#: 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:403
+#: 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:406
+#: 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:411
+#: 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:420
+#: 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:423
+#: 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:428
+#: 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:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: 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"
@@ -4041,7 +4113,7 @@ msgstr "Xatırladıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4124,7 +4196,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4137,7 +4209,7 @@ msgid "Minutes"
 msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4147,7 +4219,7 @@ msgid "S_un"
 msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4160,7 +4232,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4179,7 +4251,7 @@ msgid "Task List"
 msgstr "_Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4196,7 +4268,7 @@ msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
@@ -4205,7 +4277,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -4433,8 +4505,8 @@ msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
@@ -4503,27 +4575,27 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Vaxtlaşdırılır"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "İclas"
 
@@ -4595,19 +4667,19 @@ msgstr "_Sonlanma vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Ən az bir dinləyici lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
@@ -4648,7 +4720,7 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4660,7 +4732,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Hal"
@@ -4736,48 +4808,48 @@ msgstr "."
 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:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "saniyə"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Başqa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Şimal"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Başqa faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "...da (də)"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "hadisələr"
 
@@ -4871,7 +4943,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: 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"
 
@@ -4880,7 +4952,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4892,17 +4964,17 @@ msgstr "_Üstünlük:"
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Əsas"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4972,12 +5044,12 @@ msgid "100%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
@@ -4987,30 +5059,30 @@ msgstr "_Aç"
 msgid "_Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5039,12 +5111,12 @@ msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
@@ -5053,8 +5125,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:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -5083,7 +5155,7 @@ 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:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Mündəricat"
@@ -5150,122 +5222,122 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "İclas"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Çap Et ..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: 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:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "Quraşdırma"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Quraşdırma"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 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."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sonlanır: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "iCalendar Məlumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Naməlum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5273,331 +5345,337 @@ 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:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Naməlum"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Gediş seç:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Güncəllə"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini güncəllə"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Ən Son Məlumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, 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:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Görüş Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Görüş Güncəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Görüş Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, 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:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Vəzifə Gencəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Vəzifə Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, 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:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, 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:1248
+#: calendar/gui/e-itip-control.c:1298
 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:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 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:1307
+#: calendar/gui/e-itip-control.c:1357
 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:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, 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:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 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:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, 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:1612
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 #, 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:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -5643,7 +5721,7 @@ msgstr "başlama tarixi"
 msgid "Chair Persons"
 msgstr "İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Lazımi İştirakçılar"
 
@@ -5657,52 +5735,52 @@ 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:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Şəxsi"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Qrup"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 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:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Otaq"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Stul"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 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:845
+#: calendar/gui/e-meeting-model.c:848
 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:846
+#: calendar/gui/e-meeting-model.c:849
 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:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 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:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Temsil Edildi"
 
@@ -5792,43 +5870,50 @@ msgstr "İclas başlama saatı :"
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, 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:390
+#: calendar/gui/e-tasks.c:393
 #, 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:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, 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:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "%s başladırkən xəta oldu"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
@@ -5842,7 +5927,13 @@ msgstr "`%s'da(də) qovluq yarada bilmədim"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "%s vaxtı alarm ver"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5850,7 +5941,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5858,12 +5949,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s qovluğu açılır"
@@ -5924,55 +6015,65 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
+msgstr "Təşkilatçı bildirlməlidir."
+
+#: calendar/gui/itip-utils.c:393
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
-msgstr "Təşkilatçı bildirlməlidir."
-
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 #, fuzzy
 msgid "Event information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Güncəllə"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Siyahını Yenilə"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Sərbəst/Məşğul Məlumatı"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "təqvim məlumatı"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
@@ -6209,7 +6310,7 @@ msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
@@ -6232,7 +6333,7 @@ msgstr ""
 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:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6245,12 +6346,12 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Kartları çap et"
@@ -6323,17 +6424,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Ambara bağlana bilmirəm: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Xatırladıcı"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Təqvim İsmarışı"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6342,95 +6443,95 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Təqvim"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "indiki-vaxt 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "vaxt-düzəlt 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "vaxt-düzəlt 1 qatar arqument gözləyir"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "vaxt-düzəlt arqumenti 1  ISO 8601 tarix/vaxt qatarı olmalıdır"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını gözləyir"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? time_t olan 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? time_t olan 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? qatar olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? qatar olan arqument 2 gözləyir"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains? \"hər hansı\", \"icmal\", \"izahat\" olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? ən az 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6438,22 +6539,27 @@ msgstr ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 0 argument gözləyir"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? time_t olan arqumnet 1 gözləyir"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Axtarış ifadəsi bulean qiymət qəbul etməz"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Başqa xəta"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8151,82 +8257,82 @@ 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:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
@@ -8273,11 +8379,11 @@ msgstr "Dəstəklənməyən əməliyyat: ifadəyə görə axtar: %s üçün"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Dəstəklənməyən əməliyyat: uid-ə görə axtar: %s üçün"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "İsmarışlar daşınır"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
@@ -8598,7 +8704,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -8657,52 +8763,52 @@ msgstr "Qeyri-POP mənbəyilə ək SMTP əvvəli POP tanıtma"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, 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:800
+#: camel/camel-service.c:801
 #, 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:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
@@ -8901,7 +9007,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8910,11 +9016,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8936,7 +9042,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8991,68 +9097,76 @@ msgstr "Qovluq adı dəyişdirilə bilmir: %s: Səhv əməliyyat"
 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:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "IMAP vericisindən gözlənilməz cavab alındı: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz cavab alındı: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, 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:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, 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:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9068,28 +9182,24 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Belə bir ismarış yoxdur"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Yeni ismarışlar daranır"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9106,6 +9216,11 @@ msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Yeni ePoçt üçün baxılır"
@@ -9153,77 +9268,72 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana biləcəksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Əməliyyat dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Qovluq boş deyil"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, 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:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9234,24 +9344,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, 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:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
@@ -9327,8 +9437,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:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
@@ -9340,7 +9450,7 @@ 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:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
@@ -9354,32 +9464,32 @@ msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, 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:359
+#: camel/providers/local/camel-local-store.c:363
 #, 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:380
+#: camel/providers/local/camel-local-store.c:384
 #, 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:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "İcmal qeyd edilə bilmir: %s :%s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarış əlavə edə bilmədim: naməlum səbəb"
 
@@ -9399,6 +9509,7 @@ 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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9410,12 +9521,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9441,7 +9554,8 @@ 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:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %s"
@@ -9471,7 +9585,7 @@ msgid "Storing folder"
 msgstr "Qovluqlar saxlanılır"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
@@ -9641,40 +9755,45 @@ msgstr "`%s' qovluq deyildir."
 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:116
+#: camel/providers/local/camel-spool-store.c:118
 #, 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:128
+#: camel/providers/local/camel-spool-store.c:130
 #, 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:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Qovluq `%s/%s' faylı yoxdur."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' normal bir fayl deyildir ."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s hovuz məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, 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:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Hovuz qovluqları silinə bilməz"
 
@@ -9770,50 +9889,50 @@ msgstr "Ləğv Et"
 msgid "Operation failed: %s"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar açılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, 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:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Naməlum yağmur"
@@ -10088,45 +10207,45 @@ msgstr "Müvəqqəti tanıtma iflası"
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10137,90 +10256,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 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:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 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:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, 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:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, 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"
@@ -10228,81 +10347,72 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 bayt"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bayt"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 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:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
@@ -10334,7 +10444,7 @@ msgstr "MIME növü:"
 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:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
@@ -10345,45 +10455,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10394,12 +10504,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_Qapı:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "izah"
@@ -10414,7 +10524,7 @@ msgstr "Bir fayl yapışdır"
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza məzmunu yaradıla bilmir."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10423,34 +10533,34 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Xəbərdarlıq!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10459,7 +10569,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10468,7 +10578,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10477,7 +10587,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10485,28 +10595,39 @@ 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:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarış göndərilə bilmədi.\n"
+"\n"
+"Dəyişiklikləri qeyd etmak istəyirsiniz?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Imzanı qeyd et"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10514,7 +10635,18 @@ 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:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+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
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10522,13 +10654,13 @@ 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:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10536,8 +10668,9 @@ 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:391
-msgid "Cannot initialize Evolution's composer."
+#: 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
@@ -10589,8 +10722,8 @@ 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:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10739,7 +10872,8 @@ msgid "years"
 msgstr "il"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Vaxsey. Tarix seçməyi unutmusan."
 
 #: filter/filter-datespec.c:269
@@ -10795,15 +10929,12 @@ msgid "Add action"
 msgstr "Gediş əlavə et"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Qovluq seçməyi unutdunuz.\n"
-"Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq seçin."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Tərz adı :"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
@@ -10816,7 +10947,7 @@ 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:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Vacib"
@@ -11004,227 +11135,231 @@ msgid "Beep"
 msgstr "Beliz"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "daxil edir"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "daxil etmir"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ilə sonlanmır"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "oxçamır"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "başlamır"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildir"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Lahiyə"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "sonlanır"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "mövcuddur"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "dir(dır)"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "sonra idi"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "əvvəl idi"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Bayraqlı"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "böyükdür"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "azdır"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "deyil"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Bayraqlı"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Məs"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "böyükdür"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "azdır"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Şirkət"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "oxşayır"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "başlayır"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Hal Seç"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "daxil edir"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "daxil etmir"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "ilə sonlanmır"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "oxçamır"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "başlamır"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "sonlanır"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "mövcuddur"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "sonra idi"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "əvvəl idi"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "deyil"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "dir(dır)"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Məs"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "oxşayır"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "başlayır"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Qaydalar"
@@ -11258,31 +11393,31 @@ msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 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:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Alınır..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s %s olaraq idxal edilir"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s daranır"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Məktub"
 
@@ -11343,39 +11478,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 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:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s Yeli məktub faylı"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Qovluq daranır"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Qurğular"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Süzgəcləri Düzəlt"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11494,26 +11629,36 @@ msgid "Folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Ümumi"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Məktub daxil edən qovluq"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtual Zibil"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtual Zibil Qovluğu"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Xüsusiyyətlər..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11521,78 +11666,79 @@ 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:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Bir ismarış yaz"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Sonrakı İsmarış"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Əvvəlki İsmarış"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: 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:1067
+#: 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:1073
+#: 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:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
@@ -11637,140 +11783,140 @@ msgstr "%d yollanmış"
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bitirmə Tarixi"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Təmizlə"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
@@ -11844,20 +11990,20 @@ msgstr "Lazımi bütün məlumatlar verilməlidir."
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "İ_stifadəci Adı:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
@@ -11874,14 +12020,14 @@ 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:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Bağla"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Fəallaşdır"
 
@@ -11970,9 +12116,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
 "məktub istəmirlər:\n"
@@ -12015,7 +12162,7 @@ msgstr ""
 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:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12023,28 +12170,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:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, 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:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12052,7 +12199,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12060,39 +12207,39 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarışları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, 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:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12104,7 +12251,7 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12113,64 +12260,64 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "izah"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Adsız Əlaqə"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Göndər"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Imzanı qeyd et"
@@ -12231,16 +12378,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Yardımçısı"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesab"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
@@ -12959,78 +13106,74 @@ 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:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, 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:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Gizlə"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Ge_cikmiş işlər:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
@@ -13039,110 +13182,111 @@ msgstr "Rəsmi Fərqli qeyd et..."
 msgid "Pinging %s"
 msgstr "%s daranır"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 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:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Göndərici:  "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 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:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP təsdiq məzmunu yaradıla bilmir."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, 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:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, 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:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13151,27 +13295,22 @@ 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:809
+#: mail/mail-local.c:808
 #, 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:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s yerli qovluq olmadığı üçün yenidən sazlana bilməz"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13179,15 +13318,15 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13428,21 +13567,21 @@ msgstr "Gözləyir..."
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "Bu parolu _yadda saxla"
 
-#: mail/mail-session.c:275
+#: 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:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün Parol girin"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Parol Girin"
 
@@ -13451,11 +13590,11 @@ msgstr "Parol Girin"
 msgid "Could not save signature file: %s"
 msgstr "İmza faylı qeyd edilə bilmir."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13465,11 +13604,12 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML Imza:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Ad :"
 
@@ -13509,7 +13649,7 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VFolderlər"
 
@@ -13540,67 +13680,67 @@ msgstr "(Mövzusuz)"
 msgid "%s - Message"
 msgstr "%s - İsmarış"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -13675,45 +13815,71 @@ msgstr "Hamısına cavab ver"
 msgid "Review"
 msgstr "Nümayiş"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Bitirmə Tarixi"
+
+#: 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 "Təmizlə"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Aidiyyət"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Fayl adı:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, 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:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Heç verici seçilməyib"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Verici seçin."
 
@@ -24674,12 +24840,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "izah"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Poçt icmalı"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
@@ -24689,23 +24855,23 @@ msgstr "Yerli Qovluqlar"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 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"
 
@@ -24744,11 +24910,11 @@ msgstr "(İzahsız)"
 msgid "My Weather"
 msgstr "Mənim Hava Vəziyyətim"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Hava"
 
@@ -26080,6 +26246,11 @@ msgstr ""
 "Qovluğu daşıya bilmirəm:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "%s da(də) Aç ..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26319,12 +26490,25 @@ 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:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Qovluaq adı dəyişdirilə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26333,12 +26517,12 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Yeni _Qovluq Yarat..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Yeni ..."
 
@@ -26368,20 +26552,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Xahiş edirik, idxal edəcəyiniz məlumatı seçin:"
 
-#. 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 ""
-"%s Alınır\n"
-"Alıcı hazır deyil.\n"
-"Yenidən sınamaq üçün 5 saniyə gözlənir."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26390,23 +26561,23 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26415,11 +26586,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26428,17 +26599,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26447,31 +26618,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26479,24 +26650,24 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 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:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Al"
 
@@ -26524,32 +26695,32 @@ msgstr "Qovluqlar sinxronlaşdırılır"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution Alarmı"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s da(də) Aç ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, 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:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26591,44 +26762,44 @@ msgstr "Qovluq adı keski daxil edə bilməz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Haqqında"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 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:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -26636,26 +26807,26 @@ msgstr "Xətdən Qopuq İşlə"
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(Heç Biri)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 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:1894
+#: shell/e-shell-view.c:1903
 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:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26673,12 +26844,12 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26689,19 +26860,19 @@ 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:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -26840,58 +27011,62 @@ msgstr "Qısa Yollar"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Qovluq boş deyil"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 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:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq təkmilləşdirilə, silinə bilməz"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 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:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Bu adda qovluq yarada bilmədim"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -27107,9 +27282,10 @@ msgstr ""
 "Xahiş edirik, davam etmək üçün \"Sonrakı\" düyməsinə basın. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -27126,26 +27302,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution İdxal Yardımçısı"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution İdxalçı Yardımçısı"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Fayl İdxal Et (3 addımın 3-cüsü)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "İdxalçı Növü (3 addımın 1-cisi)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "İdxalçı Seç (3 addımın 2-cisi)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Fayl Seç (3 addımın 2-cisi)"
 
-#: 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"
@@ -27362,10 +27534,10 @@ msgstr "indiki vaxt"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Gedişlər"
 
@@ -27484,7 +27656,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Qeyd Et"
 
@@ -27511,7 +27683,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fayl"
 
@@ -27594,7 +27766,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Bu üzvlə görüş vaxtlaşdır"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Evolution Proqramımı Xüsusiləşdir"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27644,29 +27817,30 @@ msgid "Post a message to a Public folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Qovluqlara Qe_ydiyyatdan Keç..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "İsmarış nümayiş pəncərəsini göster"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzaq vericilərdəki qovluqlara qeydiyyatdan keç ya da qeydiyyatdan çıx"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Virtual Qovluq _Düzəldicisi..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Süzgəclər ..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Nümayiş Paneli"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "Qovluqlara Qe_ydiyyatdan Keç..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
@@ -27761,7 +27935,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:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -28076,7 +28250,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Göstərilən ismarışın vücudunda mətn axtar"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28190,7 +28365,7 @@ msgstr "Sitatlandırılmış"
 msgid "_Resend..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_Vasitələr"
 
@@ -28205,12 +28380,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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Göstər"
 
@@ -28384,7 +28559,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -28553,7 +28728,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Yeni _Qovluq Yarat..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -28570,114 +28745,134 @@ msgid "Pi_lot Settings..."
 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
 msgid "Send / Receive"
 msgstr "Al / Göndər"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, 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:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "ePoçt Quraşdırılması"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution haqqında məlumat göstər"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug-buddy ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Gizlə/Göstər"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 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:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Oflayn işləmənin harda olacağını bildirər"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Haqqında..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Köçürt..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Qovluq"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Daşı ..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Təkrarlama _yoxudr"
+msgid "_Remove Other User's Folder"
+msgstr "Yeni _Qovluq Yarat..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Məktub Qurğuları..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Qısa Yol"
@@ -28920,11 +29115,11 @@ msgstr "Hərf Kodlaması"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Axtarış Editoru"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
@@ -29004,6 +29199,53 @@ 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 "&lt;- _Remove"
+#~ msgstr " _Sil"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Əlavə Et"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Yeni ismarışlar daranır"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Qovluq boş deyil"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bayt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bayt"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Qovluq seçməyi unutdunuz.\n"
+#~ "Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq seçin."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s yerli qovluq olmadığı üçün yenidən sazlana bilməz"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "%s Alınır\n"
+#~ "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"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Axtarış ifadəsində xəta."
 
@@ -29048,15 +29290,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Non-Participants"
 #~ msgstr "Qeyri-İştirakçılar"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Bu ismarış göndərilə bilmədi.\n"
-#~ "\n"
-#~ "Dəyişiklikləri qeyd etmak istəyirsiniz?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (varsayılan) "
@@ -29353,14 +29586,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Select a signature script"
 #~ msgstr "İmza xaricindəkiləri sil"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML Imza:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Fayl adı:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML Imza:"
 
@@ -29392,14 +29617,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Riga"
 #~ msgstr "Sağ :"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Əlavə Et"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr " _Sil"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Həqiqətən də \"%s\" qovluğunu silmək istəyirsiniz?"
 
@@ -29956,9 +30173,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Task..."
 #~ msgstr "_Vəzifə..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Məktub Qurğuları..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "_İlişdirərək Çatdır"
 
diff --git a/po/bg.po b/po/bg.po
index 3c768fba6f..3bc92be7c2 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-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"
@@ -320,11 +320,17 @@ msgstr "�������"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "���������� ������ � ��������"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard �� %s"
@@ -335,47 +341,47 @@ msgstr "VCard �� %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "�����..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "��������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "�������� �� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "����� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� �� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��� ��������� �� �����"
@@ -394,13 +400,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook �� � �������\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "�� ���� �� ��������� wombat ������"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "�� ���� �� ��������� wombat"
@@ -469,10 +475,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "��������"
@@ -489,29 +495,39 @@ msgstr "LDAP ������"
 msgid "LDAP server containing contact information"
 msgstr "LDAP ������ �������� ���������� �� �������"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "��������"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "�����, ����� ������� ������������ �� ��������"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_�������"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "������ ��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "������ _��������"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "������ ��� ������ � �������"
@@ -560,7 +576,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ���� �� ������������� gnome-vfs"
 
@@ -568,11 +584,11 @@ msgstr "�� ���� �� ������������� gnome-vfs"
 msgid "Other Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -580,7 +596,7 @@ msgstr ""
 "�� ���� �� ������ ���� ������� �����. ���������\n"
 "���� ���� ���������� � ���� ����� ����� �� ������."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -591,7 +607,7 @@ msgstr ""
 "������ ������� URI, ��� LDAP ������� �� ������.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 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,7 +619,7 @@ msgstr ""
 "���������� �� CVS ���� ���� ��� ��������� � ����������� \n"
 "OpenLDAP �� ������������� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -614,38 +630,51 @@ msgstr ""
 "������ ������� URI, ��� LDAP ������� �� ������.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"�� ���� �� �� ���������� ���� IMAP ������.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "���������� ������ �� %s (���������� %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "����������� �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "��� �� � ���� �������"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "������������..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -653,7 +682,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -661,25 +690,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "��� �� � ���������"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -746,53 +775,53 @@ msgid "  S_how Supported Bases "
 msgstr " _�������� �� ��������� ������"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "80%"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "�����"
+
+#: 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 ""
@@ -929,48 +958,54 @@ msgstr "����"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "������ �� ���������: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "������ ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -981,7 +1016,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -990,47 +1025,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�������� �� ����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "��������� ��� �������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "����������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1038,7 +1073,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1047,7 +1082,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1055,7 +1090,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1065,7 +1100,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1075,27 +1110,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1105,7 +1140,7 @@ msgstr ""
 "���� ��� �� �� ������� �� ���������������� �� ��������������� �� ���. ������ "
 "�� ���� ��� ���������."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1113,11 +1148,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1126,25 +1161,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1152,49 +1187,49 @@ msgstr ""
 msgid "_Add"
 msgstr "���_���"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "�_�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "������� _������"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1204,102 +1239,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_���������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "������ �� Evolution."
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "����� � ����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "��� �� �������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "����� �� �������� (������)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "������ %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "�������� �� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "���� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "������ ������ � %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "�����"
@@ -1314,8 +1349,8 @@ msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1346,11 +1381,11 @@ msgstr "(%d �� �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "����� �� ������� �� ��������� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "��������� �������"
@@ -1424,7 +1459,7 @@ msgid "D_epartment:"
 msgstr "��_���"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "�������"
 
@@ -1481,13 +1516,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "������"
 
@@ -1515,1025 +1550,1025 @@ msgstr "URL �� �������� ��������:"
 msgid "_Web page address:"
 msgstr "_Web �����:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "����������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "������� � ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "�������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "����� � �����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "������ ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "��������� ������������ ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr "������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "���� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "��������� ���������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "����������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "�������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "������"
 
-#: 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
 msgid "Congo"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "������� ���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "���� �� ��������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "������������ ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "�� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "������������ ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "����������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "������� ���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "������-�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr "������� ���� � ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "���� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "�����, ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "��������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "���� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "����� ���� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "������ ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "����� ���� � �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 #, fuzzy
 msgid "Saint Vincent And The Grena-dines"
 msgstr "����� ������� � ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr "��� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr "��� ���� � ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "��������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "���� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "������� ���� �������� � ���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "����� ���� � �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "������� �������� � ��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "��������� ��������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "�������� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "������� ����� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "��������� ������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "����������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "����� ������ ������� �� ���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "��������� ���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "����������� ���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "������� ����� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "��������"
 
@@ -2570,20 +2605,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ���� �� ������ �������� ����� �� ����: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "����� �������� �� �������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "��������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "����� ���"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-����"
 
@@ -2605,6 +2640,19 @@ 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "������������ �� ����?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "����� _2:"
@@ -2736,7 +2784,7 @@ msgstr "�������� �� ��������"
 msgid "Contact List Editor"
 msgstr "�������� �� ��������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "������� ������ ���� VCard"
 
@@ -2786,7 +2834,7 @@ msgstr ""
 "���������� � �������. ������ �� �� �� �������� ������� ����?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "������������ �������"
 
@@ -2795,25 +2843,25 @@ msgstr "������������ �������"
 msgid "Search"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr " %d �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ��� ���������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2825,10 +2873,10 @@ msgid "Success"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "���������� ������"
 
@@ -2836,7 +2884,7 @@ msgstr "���������� ������"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "������� ������"
@@ -2857,8 +2905,8 @@ msgstr "��������� �� �� �������"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "����������"
 
@@ -2909,7 +2957,7 @@ msgstr "������ ��� ��������� �� ������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
@@ -2926,9 +2974,8 @@ msgstr "�������"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3018,7 +3065,7 @@ msgstr "������� �����"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
@@ -3104,7 +3151,7 @@ msgstr "�������"
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3112,8 +3159,8 @@ msgstr "�������"
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_����� �������"
@@ -3122,7 +3169,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3130,11 +3177,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3270,7 +3317,7 @@ msgid "Include:"
 msgstr "�������:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "������"
 
@@ -3295,7 +3342,7 @@ msgid "Options"
 msgstr "�����"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "����������"
 
@@ -3318,7 +3365,7 @@ msgstr "�������� �� ������:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "�������"
 
@@ -3380,20 +3427,20 @@ msgstr "���������� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "������"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "�����"
 
@@ -3404,13 +3451,17 @@ msgstr "�����"
 msgid "Undefined"
 msgstr "������������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ������������� � ����������� ������"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ���� �� ������� ��������� �� pilot"
 
@@ -3520,11 +3571,11 @@ msgstr "����� �� �������� (������)"
 msgid "_Edit appointment"
 msgstr "_���������� �����"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "���� ��������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3535,13 +3586,13 @@ msgstr ""
 "�� ��. ���� ��� ���, �� ���� ��������� � �������������\n"
 "�� ������� ����."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3552,16 +3603,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3610,7 +3661,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3689,9 +3740,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3708,13 +3759,13 @@ msgid "Assigned"
 msgstr "��������"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "��"
 
@@ -3734,82 +3785,102 @@ msgstr "������ �� �������"
 msgid "Month View"
 msgstr "����� �� �����"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "������� ������� ����� � �������"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "������� ������� ������ �� �������"
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 #, fuzzy
 msgid "New appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "������� ���� ����"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� �� �������� �� ������"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "������� ���� ������"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "���� ������"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_������"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "������� ���� ������"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "������� ���� ����"
@@ -3852,27 +3923,27 @@ 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:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "������ ����:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "������� ��������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "��������� ��������:"
 
-#: 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "� ���� ���������:"
@@ -3896,110 +3967,110 @@ msgstr "������"
 msgid "minutes"
 msgstr "������"
 
-#: 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:322
 msgid "1 day"
 msgstr "1 ���"
 
-#: 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:330
 msgid "1 week"
 msgstr "1 �������"
 
-#: 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:338
 msgid "1 hour"
 msgstr "1 ���"
 
-#: 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:346
 msgid "1 minute"
 msgstr "1 ������"
 
-#: 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:354
 msgid "1 second"
 msgstr "1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.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:391
 msgid "Send an email"
 msgstr "������� email"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:401
 msgid "Unknown action to be performed"
 msgstr "���������� �������� �� ����������"
 
-#: 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: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: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: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: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:438
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s �� ���� �� �������"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s � %s"
 
-#: 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 � ���������� ��� �� ������������"
@@ -4020,7 +4091,7 @@ msgstr "���������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4103,7 +4174,7 @@ msgid "Days"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "�����"
 
@@ -4116,7 +4187,7 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "����������"
 
@@ -4126,7 +4197,7 @@ msgid "S_un"
 msgstr "�_��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "������"
 
@@ -4139,7 +4210,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "�������� �������� �� ��������� � ����������� �� _���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "������"
 
@@ -4158,7 +4229,7 @@ msgid "Task List"
 msgstr "_������ ��� ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "���������"
 
@@ -4175,7 +4246,7 @@ msgid "Time format:"
 msgstr "������ �� �����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "�������"
 
@@ -4184,7 +4255,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "�����"
 
@@ -4409,8 +4480,8 @@ msgid "No summary"
 msgstr "���� ������"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "������� ����..."
 
@@ -4479,27 +4550,27 @@ msgstr "�������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "�������������"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "�����"
 
@@ -4568,19 +4639,19 @@ msgstr "����:"
 msgid "_Start time:"
 msgstr "������:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "��������� � �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "���� ���� ���� � �� �������!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_�������� ��.."
 
@@ -4621,7 +4692,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4633,7 +4704,7 @@ 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "������"
@@ -4709,48 +4780,48 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "���� ����� ������� ���������� ����� Evolution �� ���� �� ���������."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "���� ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "�������"
 
@@ -4844,7 +4915,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "���������� ��������"
 
@@ -4853,7 +4924,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4865,17 +4936,17 @@ msgstr "_���������:"
 msgid "_Status:"
 msgstr "_������:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4945,12 +5016,12 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_������"
@@ -4960,30 +5031,30 @@ msgstr "_������"
 msgid "_Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5012,12 +5083,12 @@ msgstr "���_����� ���� ������ ���� ���������"
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� �� �� �������� ������"
@@ -5026,8 +5097,8 @@ msgstr "�������� �� �� �������� ������"
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "����������"
 
@@ -5056,7 +5127,7 @@ msgid "Start Date"
 msgstr "������� ����"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "������"
@@ -5123,122 +5194,122 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "������ ���� _������� �� ����"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "�����"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "���� ������"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�����..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "����� �� _����"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "����� _�� ����..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_������������� ����������"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "������������"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "������������"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "������ ����..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "���� �� _�����"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "����� ���� ������� ��_����������"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "������ ���� �_������"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "����������� GNOME Pilot �������� �� � ���������� �� ���� �������"
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ���������� �� %s"
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "����: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "���������� "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "i���������� ����������"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "i�������� ������"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "���������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5246,326 +5317,332 @@ msgstr ""
 "<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
 "������� ����."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>���</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_���������������: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_������:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "������ ��������:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "������� ���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "�������� ������� �� ������������"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "������� ���������� ����������"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ��������� ���������� �� �����."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "���������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ������� ������ ���������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "����������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "������ �� ���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �������� �� ��������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �������� �������."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "���������� �� �������"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ������� ������������ ���������."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "���� ��������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ��������� ���������� �� ��������."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ������� ������ ������� � ������.."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "������ �� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��������� � ������."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �������� ������."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "���� ��������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ��������� ���������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "������ ��������/����"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �������� �� �������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "���� ��������/���� ���������"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "����������� ������� ���� ����������� ������."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "����������� �� ������� ������� �������� ���������."
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "����������� ���� ������ ������ �� ��������"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "������������ ���� �� ���� �� ���� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "�� ���� �� ������ ����� � `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������ �����"
@@ -5611,7 +5688,7 @@ msgstr "������� ����"
 msgid "Chair Persons"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "�������"
 
@@ -5625,52 +5702,52 @@ msgid "Resources"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "������������"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "���������"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "������������������"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "������ ��������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "������������ ��������"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "�� ��������"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "���������"
 
@@ -5760,43 +5837,50 @@ msgstr "������ �� �������:"
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� �� ������ � %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ���� �� ������ ������ � `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "������ ��� ���������� �� %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "��������� �� �����"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "���� _�����..."
 
@@ -5810,7 +5894,13 @@ msgstr "�� ���� �� ������ ����� � `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "������ �� %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5818,7 +5908,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5826,12 +5916,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�������� �� ����� %s"
@@ -5892,49 +5982,58 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "��������� � ���� ���� ��������."
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "��������� � ���� ���� ��������."
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "���������� ����������"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "���������� ��������/���� (%s �� %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "i���������� ����������"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
 
@@ -6170,7 +6269,7 @@ msgid "Print Calendar"
 msgstr "��������� ��������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "������� �������"
@@ -6193,7 +6292,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI �� ����� ���  ������ �� ���������"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6207,12 +6306,12 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "��������� �����"
@@ -6284,17 +6383,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "�� ���� �� �� ������ ��� ��������� %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "�������"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��������� �� ��������"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6303,115 +6402,120 @@ msgstr ""
 "Evolution ������ �������� ������� �� Pine.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "��������"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now ������ 0 ���������"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time ������ 1 ��������"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time ������ �������� 1 �� ���� ���"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day ������ 2 ���������"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin ������ 1 ��������"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "����� ������"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8005,82 +8109,82 @@ msgstr "��������� �� ����� %s"
 msgid "You must be working online to complete this operation"
 msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ��� ������ � ������: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ��� ���������� �� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ spool �����"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "�� ���� �� �������� spool �����"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "�� ���� �� ������ ���������"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "������ �� ��������� %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "������ �� ��������� - %d �� %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "������ ���������"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "������ ���������"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ��� ������� �� ������: %s: %s"
@@ -8127,11 +8231,11 @@ msgstr "����������� ��������: ������� �� �����: �� %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "����������� ��������: ������� �� uids: �� %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "�������� ���������"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "�������� �� ����������� � %s"
@@ -8452,7 +8556,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "������ ���������� �������� �������."
 
@@ -8509,52 +8613,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "������������� �� ��������� ����� ��������  %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' �� ������ �� ��������� ��� �� ����������"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' �� ������ �� ��������� ����"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �� ������ �� ��������� ���"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������� ��� ������� ����� %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
@@ -8753,7 +8857,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8762,11 +8866,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8788,7 +8892,7 @@ msgstr ""
 "������ �� �� �������� ������� ����?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8843,68 +8947,76 @@ msgstr "�� ���� �� ����������� ������� %s ������ ��������"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������� ���������� �� ������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "��������� ������� �� IMAP ������: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "��������� ������� �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "�������� �� ������� ������� ������ �����"
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "��������� OK �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ���� �� ������ ��������� �� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "�������� �� ��������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8920,28 +9032,24 @@ msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "���� ������ ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "����������� �� � �������"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "�������� �������� ���������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "�������� �� ���� ���������"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 
@@ -8958,6 +9066,11 @@ msgstr "�� ���� �� ������ cache ���������� %s"
 msgid "Failed to cache message %s: %s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "�������� �� ���� ����"
@@ -9004,77 +9117,72 @@ msgstr "������"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "���� ����� �� �� ������ � IMAP ������ ��������� ����������� ������"
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ������ �� %s �� %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "��������� ����������"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "���������� �� �� �������"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "������������ ��������"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "������� �� � ������"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������� ��������� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "���� �������� �� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "��� �� ��� ������ ������."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9085,24 +9193,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, 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:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "�� �������� ����� �� � ��������� �� ��� ��������"
 
@@ -9178,8 +9286,8 @@ msgid ""
 msgstr "�� ������ � ���������� �� ������� ���� � ���������� mbox spool �������"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9191,7 +9299,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
@@ -9205,32 +9313,32 @@ msgstr "������� ���������� ���� � inbox"
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ���� �� ������ ���� � ��������� �� ����� `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ���� �� ������ �������� ���� �� ����� `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "�� ���� �� ������ ��������� %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�� ���� �� ������ ��������� ��� ���������: ���������� �������"
 
@@ -9250,6 +9358,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9261,12 +9370,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9292,7 +9403,8 @@ msgid "not a maildir directory"
 msgstr "�� � maildir ����������"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9324,7 +9436,7 @@ msgid "Storing folder"
 msgstr "������� �����"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ���� �� ������ ��������� �� ������� %s: %s"
@@ -9493,40 +9605,45 @@ msgstr "`%s' �� � ����������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ���� �� ������ MH ����������: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' �� � maildir ����������."
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "������� `%s/%s' �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' �� � ��������� ����."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ������� �� ����� �� ���� �������"
 
@@ -9618,50 +9735,50 @@ msgstr "���������"
 msgid "Operation failed: %s"
 msgstr "���������� ����������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "��������� POP ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "���������� ����������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "����� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� POP ��������� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "���������� ������"
@@ -9935,45 +10052,45 @@ msgstr ""
 msgid "Authentication required"
 msgstr "������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s���� �������� SMTP �������� �� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9984,90 +10101,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ���� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "�� ���� �� ������� ���������: ��������� ����� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP ������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� ��������� �� SASL ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH �������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "��� ������� �� ���������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �� �������� ������� %s ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM ������ �������  %s: ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10075,80 +10192,71 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "������ ���������� �������� �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET ����� ������: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 ����"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u �����"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "��������"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� ������ �� ������� �� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "������ ��������...."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "�������� ���� ��� �����������"
 
@@ -10180,7 +10288,7 @@ msgstr "MIME ���:"
 msgid "Suggest automatic display of attachment"
 msgstr "�������� ����������� ��������� �� ��������"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "�������� ��� �� ������� �����"
 
@@ -10191,45 +10299,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "�������� ��������� �� �����������"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ������ �� ���������� �� ������ ����� �� ���� ���������"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10240,12 +10348,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "�����"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "���� ��������"
@@ -10260,7 +10368,7 @@ msgstr "�������� ����"
 msgid "Could not create a PGP signature context"
 msgstr "�� ���� �� ������ ���������� �������� �� PGP"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10269,34 +10377,34 @@ msgstr ""
 "������ ��� ������ �� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "��������!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "����� ����������. �� �� ���������?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ��� ������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "�� ���� �� ������ ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10305,7 +10413,7 @@ msgstr ""
 "�� ���� �� ������ ��� ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10314,7 +10422,7 @@ msgstr ""
 "�� ���� �� ������ ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10323,7 +10431,7 @@ msgstr ""
 "������ ��� ������������� ��������� �� ����: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10331,53 +10439,73 @@ msgstr ""
 "Ximian Evolution ������ ���������� ������� �� ���������� �����.\n"
 "������ �� �� �� ������ �� �� ����������?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"���� ��������� �� � ���� ���������.\n"
+"\n"
+"������ �� �� �������� ���������?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "��������������: ������������ ���������"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "������ ���������"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "�� ���� �� ������������� ��������� �� Evolution"
 
 #: data/evolution.desktop.in.h:1
@@ -10428,8 +10556,8 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10578,7 +10706,8 @@ msgid "years"
 msgstr "������"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "���������� �� �������� ����."
 
 #: filter/filter-datespec.c:269
@@ -10634,15 +10763,12 @@ msgid "Add action"
 msgstr "������ ��������"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"��� ���������� �� �������� �����.\n"
-"����, ������� �� � ������� ������� ����� �� ������."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "��� �� ����:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "������ �����"
 
@@ -10655,7 +10781,7 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "�����"
@@ -10842,228 +10968,232 @@ 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:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "�������� �� ����"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "��������� �� ����"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "������"
 
-#: 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
-#, fuzzy
-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
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "�������� �"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "����������"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "�"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "���� ����"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "���� �����"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-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
-#, fuzzy
-msgid "is not Flagged"
-msgstr "���������"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "�������� ������t"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "���� �� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "�������� �� ���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "�������� � �����"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "������� ����������� �� �������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "������ ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "�����"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "� ��-������ ��"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "� �� ����� ��"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "��������:"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "������ ������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "����� ����"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "���������� ��������"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "������� �"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "������ ������"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "�������"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "�� �������"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "�� �������� �"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "�� ����������"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "�� ����������"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "�� ����� ����"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "�� ������� �"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "�������� �"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "���������"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "���� ����"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "���� �����"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "� ��-������ ��"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "� �� ����� ��"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "���������"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "�� �"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "� ��-������ ��"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "� �� ����� ��"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "�����"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "����� ����"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "������� �"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�������"
@@ -11097,31 +11227,31 @@ msgstr "���������� � �� �������� ���� ���� ����� ���� ��������"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ��������� ������ ����� Elm ����"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "���������..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "���� ���������"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "��������� %s ���� %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "������� �� \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "����"
 
@@ -11182,39 +11312,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ��������� ������ ����� ���� �� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�����"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "������� mail ���� %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "������� ����������"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "�������� ������"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "���������� ������"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11332,26 +11462,36 @@ msgid "Folder containing mail"
 msgstr "����� ��������� ����"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "��������"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "����� ��������� ����"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "����� �� ��������� �����"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "���� ����� �� ���� �� ������� ���������."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "������� ����������� �� ���� �����"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11359,79 +11499,80 @@ msgstr ""
 "����� �� ������ ��������� �� ������ ��������� ���������, ���� ��������� ���� "
 "������ � �����."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "�� �� ������� ������ �� ��������� �� ����"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "��������������: ������������ ���������"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "������ ���������"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "���� ���������"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "�������� ���������"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "�� ���� �� ������������� mail ����������� �� Evolution �� �������������."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "��������� ��� �������..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "�� ���� �� ����������� ����������� ��� shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� �� \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
@@ -11476,140 +11617,140 @@ msgstr " %d ���������"
 msgid "%d total"
 msgstr "%d ����"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
@@ -11684,20 +11825,20 @@ msgstr "��� �� ��� ��������� ����� ������ �� ������������ ����������."
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_���:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "��� �� ���� �� ����� ��� ��������� � ���� ���."
 
@@ -11714,14 +11855,14 @@ msgid "Really delete account?"
 msgstr "������������ �� �� ������ �������?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "�������"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "���������"
 
@@ -11806,9 +11947,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "��� ��������� HTML-����������� ���������, �� �������� ���������� �� ����� "
 "HTML ����������� ����:\n"
@@ -11846,7 +11988,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11854,28 +11996,28 @@ msgstr ""
 "�� ���� �� ������ ������� ������� �� ���� ������.\n"
 "������ �� �� ���������� ������������ ��?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "���������� ��������"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�� %a, %Y-%m-%d � %H:%M, %%s ������:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������� �� ���, �� ������ �� ����������� ������ %d ���������?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11883,7 +12025,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11891,39 +12033,39 @@ msgstr ""
 "������ �� ��������� ������ ���� ��������� ��������\n"
 "� ������� Sent."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������� �� ���, �� ������ �� ���������� �������� %d ���������?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "���� ������� ���������"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������� ���������� ����������� ���������"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11936,7 +12078,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11945,65 +12087,65 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-�����"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "������� �� ���, �� ������ �� �������� ������ %d ��������� � ������� ��������?"
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "���� ��������"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "���������� �������"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "�������"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "������ ��������"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "������� ���������"
@@ -12064,16 +12206,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "�������� �� Evolution �� �������"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "������ %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "��������� ����������"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "��������� ��� �������..."
 
@@ -12791,78 +12933,74 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ���� �� ������ ��������� �������� �� S/MIME"
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "������� ��������"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "������� ��������"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "������ � %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "�����"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "������ Viewer"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "������� _��������"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "�_��������� ������:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "������ ��������������� �� ��������"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "������� ��������� ���� (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "������� �������� ����..."
 
@@ -12871,142 +13009,138 @@ msgstr "������� �������� ����..."
 msgid "Pinging %s"
 msgstr "������� �� \"%s\""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ���� �� ���������� MIME ���������. �������� �� � ������� ���."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "������ �����"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "�������-��"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�������� ��������: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 #, fuzzy
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 #, fuzzy
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� ���������� ����� (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������� ��� ���������� ������ ����� (\"%s\" type)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "������� �����"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "��������������� �� �����"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, 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:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�������� ����� \"%s\" � \"%s\" ������"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s �� ���� �� ���� ���������������� ������ �� � ������� �����"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13014,15 +13148,15 @@ msgstr ""
 "��� �� ���� ������ �� �������� ���� mailbox,\n"
 "���������� � �� �� ��������� �����."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "��� �� ���� �� ��������� ������� �� ��������� �����."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "��� �� ���� �� ��������� ������� �� ��������� �����."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13263,21 +13397,21 @@ msgstr "��������� ..."
 msgid "User canceled operation."
 msgstr "����������� �������� ����������."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_������� ���� ������"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "������� ���� ������ �� �������� �� ���� �����"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "���������� ������ �� %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "���������� ������"
 
@@ -13286,11 +13420,11 @@ msgstr "���������� ������"
 msgid "Could not save signature file: %s"
 msgstr "�� ���� �� ������ ���������� ����."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "������� ���������"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13300,11 +13434,12 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML ���������:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "���:"
 
@@ -13340,7 +13475,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13370,67 +13505,67 @@ msgstr "(���� ����)"
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "������������"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "����������"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "��������� �������� ���������"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "��� ����"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "�����"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "�� ����"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "��� ����"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "��������� ������ �� �����������"
 
@@ -13505,45 +13640,71 @@ msgstr "�������� �� ������"
 msgid "Review"
 msgstr "�������"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "����������"
+
+#: 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 "�������"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "������"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "��� �� ����:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "��������� �� ����� ��� %s �� \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "��������� �� ����� � ������� ���� �� \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "������� � �����..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "�� � ������ ������"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "����, �������� ������."
 
@@ -23449,12 +23610,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "���� ��������"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "��������� �� ����"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "������� �����"
 
@@ -23464,23 +23625,23 @@ msgstr "������� �����"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ���� �� ����"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "����� �� ����"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "������ �������� �� ������"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�������� URL �� ��������� �� ������ ����� ������ �� ��������"
 
@@ -23519,11 +23680,11 @@ msgstr "(��� ��������)"
 msgid "My Weather"
 msgstr "����� �����"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "�����"
 
@@ -24850,6 +25011,11 @@ msgstr ""
 "�� ���� �� ��������� �����:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "������ � %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25089,12 +25255,25 @@ msgid "Rename folder"
 msgstr "����������� �����"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "��������� ��� �� ����� � ���������: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"�� ���� �� ����������� �������:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25103,12 +25282,12 @@ msgstr ""
 "�� ���� �� ������ ��������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "������ ���� �����..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "���..."
 
@@ -25138,20 +25317,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "����, �������� ������������ ����� ������ �� �����������:"
 
-#. 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 ""
-"���������� %s\n"
-"��������� �� � �����.\n"
-"�������� 5 ������� � ������� ������."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25160,22 +25326,22 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "������ `%s' �� ����������."
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "������ � Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25184,11 +25350,11 @@ msgstr ""
 "���� �������� ����� �� �������\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25197,17 +25363,17 @@ msgstr ""
 "���������� %s.\n"
 "��������� %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ���������� �� %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25216,31 +25382,31 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "������ �� ����� � ��������� �� ����� ��������"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "������ �� �������� ����"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25248,24 +25414,24 @@ msgstr ""
 "����, ���������...\n"
 "�������� �� ������������ ���������"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "�������� ������������ �����������"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "����� �� ���������� ����� �� ����������� �� ���� �����"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "������"
 
@@ -25293,32 +25459,32 @@ msgstr "�������������� �� �����"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "�������� "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������ � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25360,44 +25526,44 @@ msgstr "����� �� ����� �� ���� �� ������� ������"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' � '..' �� �������� ����� �� �����."
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �� ���� �� ���� ���������."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "������� Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "����� � �����..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "����� �� ����� ����� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "������ ���� ���������"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ������� �� ����� ������ �� ���� �����������:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "������ � 'O_nline' "
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "������ � '_Offline'"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "������ � 'Offline'"
 
@@ -25405,27 +25571,27 @@ msgstr "������ � 'Offline'"
 msgid "(No folder displayed)"
 msgstr "(���� �������� �����)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution � ������� � 'online'.  �������� �� ���� ����� �� �� �� ����������� "
 "� ����� 'offline'."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution � � ������ �� ����������� �� ����� 'offline'."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25444,12 +25610,12 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25461,19 +25627,19 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "�������� ������"
 
@@ -25613,58 +25779,62 @@ msgstr "���������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "���� �� ���������� ����� �� � �������"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "������� �� � ������"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "��������� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "���������� �� �� �������"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "���������� ��� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� ���� �� ���� ������������ ��� �������"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "�� ���� �� ������ ����� � ���� ���"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25880,9 +26050,10 @@ msgstr ""
 "����, �������� �� ������ \"�������\" �� �� ����������."
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -25901,26 +26072,22 @@ msgid "Evolution Import Assistant"
 msgstr "����� �� ����������� �� Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "�������� �� ����������� �� Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "������ �� ���� (������ 3 �� 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "��� �� �������� (������ 1 �� 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "������ �������� (������ 2 �� 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "������ ���� (������ 2 �� 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"
@@ -26137,10 +26304,10 @@ 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-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_��������"
 
@@ -26259,7 +26426,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "�������"
 
@@ -26286,7 +26453,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_����"
 
@@ -26368,7 +26535,8 @@ msgid "Schedule a meeting for this item"
 msgstr "���������� ����� �� ���� ������"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "�������� �� ��� Evolution..."
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26419,29 +26587,30 @@ msgid "Post a message to a Public folder"
 msgstr "������� ����������� � �����"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_��������� � �����..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "������� �������� �������� �� ��������� "
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "��������� � ����������� �� ����� �� ���������� �������"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "�������� �� ��������� �����"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_������..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_������������� ������� �� Pane"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_��������� � �����..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "������� ����������� �� ���� �����"
@@ -26535,7 +26704,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_���������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "�����"
 
@@ -26851,7 +27020,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "������� �� ����� � ������ �� ����������� ���������"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "��������� �� ���������� �� ������ ����� �������"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26964,7 +27134,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr "�����������..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "���_��������"
 
@@ -26979,12 +27149,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:43
+#: 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:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_������"
 
@@ -27158,7 +27328,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_�����"
 
@@ -27327,7 +27497,7 @@ msgid "Open Other _User's Folder..."
 msgstr "������ ���� �����..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -27344,114 +27514,134 @@ msgid "Pi_lot Settings..."
 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
 msgid "Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "������� �������� �� ���� � �������� ����"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Mail ������������"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Mail ������������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "������ ���������� �� Ximian ��������"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ������ �� ������ ���� ��� ����"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "���������"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "��������� ����������� �� ������ � �������"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "��������� ����������� �� ������ � ������������"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "��������� ������ ��/��-����"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "������ ��������� �����"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "������� Ximian ��������..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "�������..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "����� � �����"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "�����"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "����� � �����..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "�����..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "��������..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "���"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "���� �����"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_���� ����������"
+msgid "_Remove Other User's Folder"
+msgstr "������ ���� �����..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "�������� ���������..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "����� � ����������"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "���������"
@@ -27694,11 +27884,11 @@ msgstr "���������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "�������� �� �������"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "������ �������"
 
@@ -27778,6 +27968,53 @@ msgstr "init_corba(): �� ���� �� ������������� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "�_�����"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "�������� �� ���� ���������"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "������� �� � ������"
+
+#~ msgid "1 byte"
+#~ msgstr "1 ����"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u �����"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "��� ���������� �� �������� �����.\n"
+#~ "����, ������� �� � ������� ������� ����� �� ������."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s �� ���� �� ���� ���������������� ������ �� � ������� �����"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "���������� %s\n"
+#~ "��������� �� � �����.\n"
+#~ "�������� 5 ������� � ������� ������."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "�������� �� ����������� �� Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_���� ����������"
+
 #~ msgid "Error in search expression."
 #~ msgstr "������ � ������� �� �����."
 
@@ -27789,10 +28026,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Email is"
 #~ msgstr "��. ���� 2"
 
-#, fuzzy
-#~ msgid "<- _Remove"
-#~ msgstr "�����"
-
 #~ msgid "Could not create the alarm notify service"
 #~ msgstr "�� ���� �� ������ ���������� �� �������� �����������"
 
@@ -27849,15 +28082,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "������� _����� �� ������:"
 
 #~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "���� ��������� �� � ���� ���������.\n"
-#~ "\n"
-#~ "������ �� �� �������� ���������?"
-
-#~ msgid ""
 #~ "Evolution is unable to get the addressbook local storage.\n"
 #~ "This may have been caused by the evolution-addressbook component "
 #~ "crashing.\n"
@@ -28105,14 +28329,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "������� ������ ���������"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML ���������:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "��� �� ����:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML ���������:"
 
@@ -28144,10 +28360,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "����"
 
 #, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "�_�����"
-
-#, fuzzy
 #~ msgid "<- Remove"
 #~ msgstr "�����"
 
@@ -28491,12 +28703,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "_Delete this Task"
 #~ msgstr "������ ���� ����_��"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "���������� ��������/���� (%s �� %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "i���������� ����������"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "������ ���������� � ������, �������� �� ���"
 
@@ -28723,9 +28929,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_������..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "�������� ���������..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "�������� _���������"
 
diff --git a/po/ca.po b/po/ca.po
index 60a0763fc8..ac330ab546 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-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"
@@ -345,12 +345,18 @@ msgstr "Nom complet:"
 msgid "%x"
 msgstr "x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Contacte _nou"
+
+#: addressbook/backend/ebook/e-card.c:2681
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -361,51 +367,51 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 #, fuzzy
 msgid "Loading..."
 msgstr "_Par�metres"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error en llegir el fitxer de correu: %s"
@@ -424,13 +430,13 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 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:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
@@ -507,10 +513,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 #, fuzzy
 msgid "Contacts"
@@ -535,32 +541,44 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "_Contactes..."
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr ""
+"Error en carregar la informaci� del filtre:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:567
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crea un nou contacte"
@@ -612,7 +630,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -622,24 +640,24 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:471
+#: 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:477
+#: addressbook/gui/component/addressbook.c:480
 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:487
+#: addressbook/gui/component/addressbook.c:490
 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:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -647,48 +665,61 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 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:613
-#: addressbook/gui/component/addressbook.c:616
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
 #, fuzzy, c-format
-msgid "Enter password for %s (user %s)"
+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:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -696,7 +727,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -704,26 +735,26 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -797,51 +828,51 @@ msgstr "Detecta els tipus suportats..."
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Opcions"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "Elimina"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "<< Elimina"
+
+#: 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 ""
@@ -981,51 +1012,57 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Valors predeterminats"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, 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:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona'ls _tots"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Suprimeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1036,7 +1073,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1045,49 +1082,49 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Cap informaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Fes un so en visualitzar les alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Sub"
 msgstr "Dg"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Seleccioneu una carpeta"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1095,7 +1132,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1104,7 +1141,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1112,7 +1149,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1122,7 +1159,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1132,34 +1169,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1167,11 +1204,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1180,25 +1217,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1206,49 +1243,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "Afegeix >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1258,104 +1295,104 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edita"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Edita una cita"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Opcions"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "N�mero de port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Valors predeterminats"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Server name:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durada de l'snooze (minuts)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "cont�"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cerca"
@@ -1371,8 +1408,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1408,11 +1445,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "Cerca un contacte"
@@ -1492,7 +1529,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Detalls"
 
@@ -1555,13 +1592,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -1591,1098 +1628,1098 @@ msgstr "Agenda"
 msgid "_Web page address:"
 msgstr "Adre�a de p�gina web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United States"
 msgstr "Mou el missatge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #, fuzzy
 msgid "Antarctica"
 msgstr "Tria autom�tica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 #, fuzzy
 msgid "Argentina"
 msgstr "Orientaci�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 #, fuzzy
 msgid "Austria"
 msgstr "agost"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 #, fuzzy
 msgid "Belarus"
 msgstr "anys"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "Mida"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 #, fuzzy
 msgid "Benin"
 msgstr "S'est� enviant \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 #, fuzzy
 msgid "Brazil"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 msgid "Chad"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "_Fitxer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 #, fuzzy
 msgid "China"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #, fuzzy
 msgid "Comoros"
 msgstr "Colors"
 
-#: 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
 #, fuzzy
 msgid "Congo"
 msgstr "S'est� copiant"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 #, fuzzy
 msgid "France"
 msgstr "Cancel�lat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 #, fuzzy
 msgid "Germany"
 msgstr "maig"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "setmana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #, fuzzy
 msgid "Greenland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #, fuzzy
 msgid "Grenada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #, fuzzy
 msgid "Guam"
 msgstr "am"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 #, fuzzy
 msgid "Guinea"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 #, fuzzy
 msgid "Haiti"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 #, fuzzy
 msgid "Honduras"
 msgstr "Hores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 #, fuzzy
 msgid "Hungary"
 msgstr "Diumenge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 #, fuzzy
 msgid "Italy"
 msgstr "avui"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 #, fuzzy
 msgid "Laos"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #, fuzzy
 msgid "Lesotho"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberia"
 msgstr "abril"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 #, fuzzy
 msgid "Lithuania"
 msgstr "vuit�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Macau"
 msgstr "mar�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #, fuzzy
 msgid "Malawi"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 #, fuzzy
 msgid "Mali"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Martinique"
 msgstr "Minut"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 #, fuzzy
 msgid "Mauritius"
 msgstr "Marges"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #, fuzzy
 msgid "Mayotte"
 msgstr "Dilluns"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 #, fuzzy
 msgid "Monaco"
 msgstr "Dilluns"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 #, fuzzy
 msgid "Mozambique"
 msgstr "M�bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 #, fuzzy
 msgid "Myanmar"
 msgstr "Busca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 #, fuzzy
 msgid "Nepal"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selecciona'ls _tots"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 #, fuzzy
 msgid "New Caledonia"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 #, fuzzy
 msgid "New Zealand"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 #, fuzzy
 msgid "Niger"
 msgstr "Alta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 #, fuzzy
 msgid "Nigeria"
 msgstr "abril"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 #, fuzzy
 msgid "Niue"
 msgstr "Minut"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norway"
 msgstr "Ara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Pakistan"
 msgstr "Enganxa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Peru"
 msgstr "Paper"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Portugal"
 msgstr "Vertical"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Qatar"
 msgstr "despr�s de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 #, fuzzy
 msgid "Reunion"
 msgstr "Seccions:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 #, fuzzy
 msgid "Rwanda"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 #, fuzzy
 msgid "Samoa"
 msgstr "Puntuaci�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 #, fuzzy
 msgid "Senegal"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 #, fuzzy
 msgid "Seychelles"
 msgstr "Seleccioneu una carpeta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 #, fuzzy
 msgid "Somalia"
 msgstr "Normal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "Spain"
 msgstr "_Envia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 #, fuzzy
 msgid "Sudan"
 msgstr "dg."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Suriname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 #, fuzzy
 msgid "Swaziland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 #, fuzzy
 msgid "Sweden"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiwan"
 msgstr "R�dio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Tasques"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 #, fuzzy
 msgid "Thailand"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 #, fuzzy
 msgid "Togo"
 msgstr "Per a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 #, fuzzy
 msgid "Tonga"
 msgstr "Avui"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turkey"
 msgstr "dm."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Tasca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 #, fuzzy
 msgid "Uganda"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Seleccioneu els noms"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yemen"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr ""
 
@@ -2723,22 +2760,22 @@ msgstr "TTY/TDD"
 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 #, fuzzy
 msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
@@ -2760,6 +2797,19 @@ msgid ""
 "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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Voleu sobreescriure el fitxer?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adre�a _2:"
@@ -2897,7 +2947,7 @@ msgstr "Contacta l'editor"
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
@@ -2948,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
@@ -2958,27 +3008,27 @@ msgstr "Afegeix..."
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 #, fuzzy
 msgid "No cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segons"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
@@ -2992,10 +3042,10 @@ msgid "Success"
 msgstr "Fonts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -3004,7 +3054,7 @@ msgstr "Error desconegut"
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Perm�s denegat"
@@ -3027,8 +3077,8 @@ msgstr "Operaci� no suportada"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
@@ -3085,7 +3135,7 @@ 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:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
@@ -3103,9 +3153,8 @@ msgstr "_Visualitzaci�"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3210,7 +3259,7 @@ msgstr "Desa a la llibreta d'adreces"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
@@ -3300,7 +3349,7 @@ msgstr "Copia"
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3308,8 +3357,8 @@ msgstr "Enganxa"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3318,7 +3367,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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 +3375,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3471,7 +3520,7 @@ msgid "Include:"
 msgstr "Inclou:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horitzontal"
 
@@ -3496,7 +3545,7 @@ msgid "Options"
 msgstr "Opcions"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientaci�"
 
@@ -3519,7 +3568,7 @@ msgstr "Font del paper:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3583,20 +3632,20 @@ msgstr "Edita una cita"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Baixa"
 
@@ -3607,13 +3656,17 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 
@@ -3736,12 +3789,12 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3749,14 +3802,14 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'est� movent"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3767,17 +3820,17 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -3833,7 +3886,7 @@ msgstr "%A, %d de %B de %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3912,9 +3965,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3933,13 +3986,13 @@ msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 #, fuzzy
 msgid "No"
 msgstr "Ara"
@@ -3964,85 +4017,104 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Agenda"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tasques"
 
-#: calendar/gui/component-factory.c:75
+#: 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:709
+#: 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:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 #, fuzzy
 msgid "Create a new task"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita"
@@ -4091,30 +4163,30 @@ 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"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 #, fuzzy
 msgid "Play sound:"
 msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 #, fuzzy
 msgid "Run program:"
 msgstr "_Executa el programa:"
 
-#: 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr ""
@@ -4139,119 +4211,119 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.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:381
+#: 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:385
+#: 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:391
+#: calendar/gui/dialogs/alarm-page.c:401
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Error desconegut"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: 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:406
+#: 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:411
+#: 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:420
+#: 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:423
+#: 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:428
+#: 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:452
+#: 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:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -4274,7 +4346,7 @@ msgstr "Recordatoris"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4365,7 +4437,7 @@ msgid "Days"
 msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Divendres"
 
@@ -4378,7 +4450,7 @@ msgid "Minutes"
 msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -4388,7 +4460,7 @@ msgid "S_un"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -4402,7 +4474,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -4422,7 +4494,7 @@ msgid "Task List"
 msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -4440,7 +4512,7 @@ msgid "Time format:"
 msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -4449,7 +4521,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -4696,8 +4768,8 @@ msgid "No summary"
 msgstr "Sense resum"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
@@ -4790,29 +4862,29 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel�lat"
@@ -4889,19 +4961,19 @@ msgstr "Hora de _finalitzaci�:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -4949,7 +5021,7 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4962,7 +5034,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -5043,47 +5115,47 @@ msgstr "4"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "primer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segon"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "tercer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "quart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Un altre fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
@@ -5182,7 +5254,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 #, fuzzy
 msgid "Needs Action"
 msgstr "Elimina una acci�"
@@ -5193,7 +5265,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -5206,19 +5278,19 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5289,13 +5361,13 @@ msgid "100%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
@@ -5306,8 +5378,8 @@ msgstr "_Obre"
 msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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
@@ -5315,24 +5387,24 @@ msgstr "Anomena i desa..."
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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
@@ -5364,12 +5436,12 @@ msgstr "Marca com a completa"
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5379,8 +5451,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:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5413,7 +5485,7 @@ 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:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 #, fuzzy
 msgid "Summary"
@@ -5483,495 +5555,505 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Error en desar el fitxer: %s"
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripci�:"
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informaci�"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, 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:1131
+#: calendar/gui/e-itip-control.c:1138
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
+#: calendar/gui/e-itip-control.c:1517
+#, 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:1470
+#: calendar/gui/e-itip-control.c:1520
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, 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:1612
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -6023,7 +6105,7 @@ msgstr "Inici del dia:"
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
@@ -6039,56 +6121,56 @@ msgid "Resources"
 msgstr "Font"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 #, 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:829
+#: calendar/gui/e-meeting-model.c:832
 #, 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:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 #, 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:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 #, 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:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentatiu"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
@@ -6180,45 +6262,52 @@ msgstr "Hora d'_inici de la reuni�:"
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, 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:390
+#: calendar/gui/e-tasks.c:393
 #, 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:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, 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:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
@@ -6235,7 +6324,13 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarmes"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6243,7 +6338,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6251,12 +6346,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -6331,54 +6426,64 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 #, fuzzy
 msgid "Event information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Refresca la llista"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6620,7 +6725,7 @@ msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
@@ -6645,7 +6750,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6653,13 +6758,13 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimeix l'agenda"
@@ -6724,131 +6829,136 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatori"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Agenda"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "_Obre una agenda"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Error d'E/S"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8467,87 +8577,87 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 #, 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:957
+#: camel/camel-filter-driver.c:966
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "adjunci�"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "adjunci�"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -8598,12 +8708,12 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "C�pia de missatges"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "C�pia de missatges"
@@ -8932,7 +9042,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -8997,51 +9107,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9237,7 +9347,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9246,11 +9356,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -9267,7 +9377,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9319,71 +9429,79 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 #, 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:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, 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:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, 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:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, 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:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9399,7 +9517,7 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
@@ -9407,25 +9525,20 @@ msgstr ""
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 #, 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:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-#, fuzzy
-msgid "Scanning for new messages"
-msgstr "C�pia de missatges"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -9442,6 +9555,11 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Missatge de _correu (FIXME)"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Missatge de _correu (FIXME)"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
@@ -9495,17 +9613,17 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
@@ -9513,62 +9631,57 @@ msgstr "Servei %s per a %s en %s"
 msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci� no suportada"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "La carpeta `%s' no existeix."
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9579,24 +9692,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9677,8 +9790,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:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9690,7 +9803,7 @@ 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:237
+#: camel/providers/local/camel-local-store.c:238
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
@@ -9704,32 +9817,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, 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:359
+#: camel/providers/local/camel-local-store.c:363
 #, 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:380
+#: camel/providers/local/camel-local-store.c:384
 #, 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:390
+#: camel/providers/local/camel-local-store.c:394
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No s'ha pogut obrir el resum %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9750,6 +9863,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9761,12 +9875,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9793,7 +9909,8 @@ 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:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9826,7 +9943,7 @@ msgid "Storing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
@@ -10002,41 +10119,46 @@ msgstr "`%s' no �s un directori."
 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:116
+#: camel/providers/local/camel-spool-store.c:118
 #, 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:128
+#: camel/providers/local/camel-spool-store.c:130
 #, 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:145
+#: camel/providers/local/camel-spool-store.c:150
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, 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
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
@@ -10129,52 +10251,52 @@ msgstr "Cancel�lat"
 msgid "Operation failed: %s"
 msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, 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:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Error desconegut"
@@ -10463,46 +10585,46 @@ msgstr "Autenticaci�:"
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, 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:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10513,95 +10635,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, 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:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, 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:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 #, 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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, 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."
@@ -10609,80 +10731,71 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, 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:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 octet"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u octets"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 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:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -10714,7 +10827,7 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
@@ -10725,7 +10838,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:382
+#: composer/e-msg-composer-hdrs.c:399
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -10733,38 +10846,38 @@ msgstr "Respon"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10775,12 +10888,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioritat:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descripci�:"
@@ -10795,7 +10908,7 @@ msgstr "Adjunta un fitxer"
 msgid "Could not create a PGP signature context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10804,112 +10917,132 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 #, fuzzy
 msgid "Warning!"
 msgstr "S'est� movent"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 #, 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:1249
+#: composer/e-msg-composer.c:1255
 #, 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:1256
+#: composer/e-msg-composer.c:1262
 #, 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:1265
+#: composer/e-msg-composer.c:1271
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 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:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Aquest missatge no s'ha enviat.\n"
+"\n"
+"Voleu desar-ne els canvis?"
+
+#: composer/e-msg-composer.c:1536
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr "No s'ha pogut crear la finestra del redactor."
+
+#: composer/e-msg-composer.c:2879
 #, 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:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
+#: composer/evolution-composer.c:408
 #, fuzzy
-msgid "Cannot initialize Evolution's composer."
+msgid "Cannot initialize the Evolution composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10967,8 +11100,8 @@ 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:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11130,8 +11263,9 @@ msgid "years"
 msgstr "anys"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
-msgstr ""
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Nom de l'estil:"
 
 #: filter/filter-datespec.c:269
 msgid "<click here to select a date>"
@@ -11187,13 +11321,12 @@ msgid "Add action"
 msgstr "Afegeix una acci�"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Nom de l'estil:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -11206,7 +11339,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr ""
@@ -11406,239 +11539,243 @@ msgid "Beep"
 msgstr "Mida"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "cont�"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no cont�"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comen�a per"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "acaba amb"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "�s"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "ha estat despr�s de"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "ha estat abans de"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "�s m�s gran que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "�s m�s petit que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no �s"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "no �s"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Ocupat"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "�s m�s gran que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "�s m�s petit que"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Empresa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comen�a per"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Estat de la connexi�"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "cont�"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "no cont�"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "no comen�a per"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "ha estat despr�s de"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "ha estat abans de"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "�s m�s gran que"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "no �s"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "no �s"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�s"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "�s m�s gran que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "comen�a per"
+
 #: filter/rule-editor.c:180
 #, fuzzy
 msgid "Rules"
@@ -11676,33 +11813,33 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "acaba amb"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -11760,43 +11897,43 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fitxer de correu local %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filtres d'edici�"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11924,111 +12061,122 @@ msgstr "Filtre sobre la llista de correu"
 
 #: mail/component-factory.c:103
 #, fuzzy
+msgid "Public Mail"
+msgstr "P�blic"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/component-factory.c:104
+#, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Reenvia el missatge"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "_Missatge"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "_Imprimeix el missatge"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: 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:1067
+#: 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:1073
+#: 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:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -12073,152 +12221,152 @@ msgstr " segons"
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
@@ -12296,22 +12444,22 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12332,15 +12480,15 @@ msgid "Really delete account?"
 msgstr ""
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr ""
 
@@ -12426,8 +12574,8 @@ msgstr ""
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
 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 ""
 
 #: mail/mail-callbacks.c:270
@@ -12465,37 +12613,37 @@ msgstr ""
 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:776
+#: mail/mail-callbacks.c:777
 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:1206
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, 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:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12503,7 +12651,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -12512,44 +12660,44 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, 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:2457
+#: mail/mail-callbacks.c:2484
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12557,7 +12705,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12566,67 +12714,67 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Descripci�:"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacte _nou"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "n"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Fitxer de signatura:"
@@ -12669,16 +12817,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "cont�"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
@@ -13417,82 +13565,78 @@ 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:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, 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:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Elements que ja han ven�ut:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
@@ -13502,113 +13646,114 @@ msgstr "Anomena i desa..."
 msgid "Pinging %s"
 msgstr "S'est� examinant %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 #, 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:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correu"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13617,29 +13762,24 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13647,15 +13787,15 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
 #: mail/mail-mt.c:257
 #, fuzzy, c-format
 msgid ""
@@ -13913,21 +14053,21 @@ msgstr "_Par�metres"
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, 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:335
+#: mail/mail-session.c:333
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -13939,12 +14079,12 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 #, fuzzy
 msgid "Save signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -13955,11 +14095,12 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "Fitxer de signatura:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nom:"
 
@@ -13997,7 +14138,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -14030,77 +14171,77 @@ msgstr "Re: (sense assumpte)"
 msgid "%s - Message"
 msgstr "_Missatge"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -14177,48 +14318,74 @@ msgstr "Respon a tots"
 msgid "Review"
 msgstr "Previsualitzaci�:"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "FIXME: _Assenyala per al seguiment..."
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "% comp_let:"
+
+#: 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 "Agenda"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Data de venciment"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nom del fitxer:"
+
+#: mail/subscribe-dialog.c:229
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Desa a la _carpeta..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr ""
 
@@ -25021,13 +25188,13 @@ msgstr "%A, %d de %B"
 msgid "No description"
 msgstr "Descripci�:"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
@@ -25038,24 +25205,24 @@ msgstr "Carpetes virtuals"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -25098,11 +25265,11 @@ msgstr "(Sense descripci�)"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 #, fuzzy
 msgid "Weather"
 msgstr "Altres"
@@ -26499,6 +26666,11 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Obre a %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26736,12 +26908,25 @@ 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:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, 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-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26750,12 +26935,12 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Crea una carpeta nova..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nou..."
 
@@ -26780,129 +26965,119 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#. 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 ""
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, 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:524
+#: shell/e-shell-importer.c:514
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -26928,32 +27103,32 @@ msgstr "S'est� sincronitzant \"%s\""
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronitza \"%s\""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Obre a %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, 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:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26998,47 +27173,47 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "_Quant a l'Evolution..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
@@ -27047,26 +27222,26 @@ msgstr "S'est� movent"
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -27079,12 +27254,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -27092,21 +27267,21 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Error gen�ric"
 
@@ -27260,60 +27435,64 @@ msgstr "Mostra la barra de _dreceres"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "No es pot bifurcar %s: %s"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -27534,7 +27713,7 @@ msgstr ""
 #: shell/glade/evolution-startup-wizard.glade.h:15
 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. "
 msgstr ""
@@ -27550,29 +27729,24 @@ msgstr "Conducte de les coses per fer de l'Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Fitxer de signatura:"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 #, fuzzy
 msgid "Select Importers (step 2 of 3)"
 msgstr "Fitxer de signatura:"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Fitxer de signatura:"
 
-#: 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"
@@ -27831,10 +28005,10 @@ msgstr "l'hora actual"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -27973,7 +28147,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Desa"
 
@@ -28002,7 +28176,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -28099,7 +28273,7 @@ msgstr "Seleccioneu una carpeta"
 
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "Customise My Evolution"
+msgid "Customize My Evolution"
 msgstr "Evolution - %s"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -28153,33 +28327,33 @@ msgid "Post a message to a Public folder"
 msgstr "Copia el missatge a una nova carpeta"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Previsualitzaci�:"
 
-#: ui/evolution-mail-global.xml.h:19
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
@@ -28288,7 +28462,7 @@ msgstr "Llista de missatges en cadena"
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -28642,7 +28816,7 @@ msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+msgid "Set up the page settings for your current printer"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28773,7 +28947,7 @@ msgstr "Cap"
 msgid "_Resend..."
 msgstr "_Tanca..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -28790,13 +28964,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:43
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -28997,7 +29171,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -29184,7 +29358,7 @@ msgid "Open Other _User's Folder..."
 msgstr "_Crea una carpeta nova..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -29203,130 +29377,150 @@ 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
+#, fuzzy
 msgid "Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, 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:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configuraci� del correu"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuraci� del correu"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "Toggle"
 msgstr "M�bil"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Import..."
 msgstr "S'est� movent"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Prefer�ncies"
+msgid "_Remove Other User's Folder"
+msgstr "_Crea una carpeta nova..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Par�metres"
+
+#: ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Mostra la barra de _dreceres"
@@ -29585,12 +29779,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
@@ -29683,6 +29877,36 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "Elimina"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "Afegeix >>"
+
+#, fuzzy
+#~ msgid "Scanning for new messages"
+#~ msgstr "C�pia de missatges"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "La carpeta `%s' no existeix."
+
+#~ msgid "1 byte"
+#~ msgstr "1 octet"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u octets"
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Conducte de les coses per fer de l'Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Prefer�ncies"
+
+#, fuzzy
 #~ msgid "Error in search expression."
 #~ msgstr ""
 #~ "Error en preparar-se per a %s:\n"
@@ -29738,15 +29962,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Persones _requerides"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Aquest missatge no s'ha enviat.\n"
-#~ "\n"
-#~ "Voleu desar-ne els canvis?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr "Valors predeterminats"
@@ -30010,14 +30225,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Fitxer de signatura:"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nom del fitxer:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Fitxer de signatura:"
 
@@ -30052,14 +30259,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Dreta:"
 
 #, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Afegeix >>"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "<< Elimina"
-
-#, fuzzy
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr ""
 #~ "Esteu segur que voleu\n"
@@ -30428,10 +30627,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Tasca"
 
 #, fuzzy
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Par�metres"
-
-#, fuzzy
 #~ msgid "Forward _Attached"
 #~ msgstr "Reenvia"
 
diff --git a/po/cs.po b/po/cs.po
index 86691b16cd..70a47c25f2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-09-27 14:44-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-08-22 18:27-0400\n"
 "Last-Translator: Radka Doul�kov� <doulikova@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -324,12 +324,12 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Nepojmenovan� seznam kontakt�"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2681
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "V�ceero VKar�t"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
@@ -340,46 +340,46 @@ msgstr "VCard pro %s"
 #: 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:1736
+#: calendar/conduits/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Nelze spustit Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Vyhled�v�m..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Na��t�m..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr "P�ipojuji se znovu k LDAP serveru..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "P�id�v�m kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Odstra�uji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Upravuji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "P�ij�m�m v�sledky hled�n� LDAP"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Chyba p�i prov�d�n� hled�n�"
 
@@ -396,13 +396,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook nebyl na�ten\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1212
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Nelze spustit wombat server"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1213
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Nelze spustit wombat"
@@ -563,7 +563,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:159
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "Nelze spustit gnome-vfs"
 
@@ -1313,7 +1313,7 @@ msgstr "Tov�rna pro rozhran� v�b�ru jm�na adres��e."
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:713
+#: addressbook/gui/component/select-names/e-select-names.c:712
 #: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
@@ -1345,11 +1345,11 @@ msgstr "<(%d nezobrazeno)"
 msgid "Unnamed Contact"
 msgstr "Nepojmenovan� kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adres��e"
 
-#: addressbook/gui/component/select-names/e-select-names.c:578
+#: addressbook/gui/component/select-names/e-select-names.c:576
 msgid "Find contact in"
 msgstr "Naj�t kontakt v"
 
@@ -1422,7 +1422,7 @@ msgid "D_epartment:"
 msgstr "O_dd�len�:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1488,7 +1488,7 @@ msgstr "Chce dost�vat po�tu v _HTML form�tu"
 #: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:47
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Smazat"
 
@@ -2841,7 +2841,7 @@ msgstr "�sp�ch"
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
 #: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
-#: shell/e-storage.c:518 shell/evolution-shell-component.c:1180
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Nezn�m� chyba"
 
@@ -2849,7 +2849,7 @@ msgstr "Nezn�m� chyba"
 msgid "Repository offline"
 msgstr "Sklad p�i odpojen�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "P��stup zam�tnut"
@@ -2919,7 +2919,7 @@ msgstr "Chyba p�i odstra�ov�n� seznamu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Chyba p�i odstra�ov�n� karty"
 
@@ -2932,11 +2932,10 @@ msgid "Display Cards"
 msgstr "Zobrazit karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:213
-#, c-format
+#, 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 ""
 "Po�adujete zobrazen� %d karet. T�m se zobraz� %d nov�ch oken na Va�� "
 "obrazovce. Opravdu si p�ejete zobrazit v�echny tyto karty?"
@@ -3024,7 +3023,7 @@ msgstr "Adres��"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ulo�it jako VCard"
@@ -3101,7 +3100,7 @@ msgstr "Kop�rovat"
 msgid "Paste"
 msgstr "Vlo�it"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3109,7 +3108,7 @@ msgstr "Vlo�it"
 msgid "Delete"
 msgstr "Smazat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
+#: addressbook/gui/widgets/e-addressbook-view.c:931
 #: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 msgid "Current View"
 msgstr "Aktu�ln� n�hled"
@@ -3118,7 +3117,7 @@ msgstr "Aktu�ln� n�hled"
 #. 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3126,11 +3125,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3262,7 +3261,7 @@ msgid "Include:"
 msgstr "Obsahuje:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Nale�ato"
 
@@ -3287,7 +3286,7 @@ msgid "Options"
 msgstr "Volby"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientace"
 
@@ -3310,7 +3309,7 @@ msgstr "Zdroj pap�ru:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Nastojato"
 
@@ -3396,13 +3395,17 @@ msgstr "N�zk�"
 msgid "Undefined"
 msgstr "Nedefinov�no"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1159
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Chyba p�i komunikaci se serverem kalend��e"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1306
-#: calendar/conduits/calendar/calendar-conduit.c:1309
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nelze p�e��st blok aplikac� Calendar pilota"
 
@@ -3510,11 +3513,11 @@ msgstr "Doba odlo�en� (minut)"
 msgid "_Edit appointment"
 msgstr "_Upravit ud�lost"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Popis nen� dostupn�."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3526,13 +3529,13 @@ msgstr ""
 "vytvo�ena k posl�n� e-mailu. Evolution nam�sto toho\n"
 "zobraz� dialogov� okno pro b�nou p�ipom�nku."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2874
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varov�n�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3549,15 +3552,15 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "P���t� se neptat na tento program."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nelze inicializovat GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Nelze vytvo�it tov�rnu ke slu�b� hl�en� alarmu"
 
@@ -3606,7 +3609,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3685,7 +3688,7 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1962
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
 #: mail/folder-browser.c:1709 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:78
@@ -3750,9 +3753,9 @@ msgstr "_Ve�ejn� kalend�� URL:"
 msgid "Public folder containing appointments and events"
 msgstr "Slo�ka obsahuj�c� ud�losti"
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:705
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
@@ -3859,29 +3862,30 @@ msgid "Alarm Repeat"
 msgstr "Opakov�n� 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 ""
+"Toto je p�ipom�nka s ozn�men�m e-mailem, av�ak Evolution zat�m tyto druhy "
+"p�ipom�nek nepodporuje. Nebudete moci editovat volby pro tuto p�ipom�nku."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Zobrazit tuto zpr�vu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Zahr�t zvuk:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Opakovat alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Spustit 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 ""
-"Toto je p�ipom�nka s ozn�men�m e-mailem, av�ak Evolution zat�m tyto druhy "
-"p�ipom�nek nepodporuje. Nebudete moci editovat volby pro tuto p�ipom�nku."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "S t�mito parametry:"
@@ -3905,110 +3909,110 @@ msgstr "hodinu/-y"
 msgid "minutes"
 msgstr "minut(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dny/-�"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 den"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d t�dny/-�"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 t�den"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin(-y)"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 hodinu"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut(-y)"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minutu"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d vte�in(-y)"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 vte�ina"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Zahr�t zvuk"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Zobrazit zpr�vu"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Poslat e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Spustit program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "M� se vykonat nezn�m� akce"
 
-#: 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 p�ed za��tkem ud�losti"
 
-#: 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 po za��tku ud�losti"
 
-#: 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 p�i za��tku ud�losti"
 
-#: 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 p�ed koncem ud�losti"
 
-#: 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 po konci ud�losti"
 
-#: 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 na konci ud�losti"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s p�i %s"
 
-#: 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 pro nezn�m� typ spou�t�n�"
@@ -4405,8 +4409,8 @@ msgid "No summary"
 msgstr "Nen� shrnut�"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3983
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Ulo�it jako..."
 
@@ -4475,27 +4479,27 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupen�"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Ud�lost"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "P�ipom�nka"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Opakov�n�"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Pl�nov�n�"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Sch�zka"
 
@@ -4629,7 +4633,7 @@ msgstr "Funkce"
 
 #: 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:59
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4852,13 +4856,13 @@ msgstr "_Nal�havost:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Z�kladn�"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "P�ed�n�"
 
@@ -4995,12 +4999,12 @@ msgstr "Ozna�it _vybran� �koly jako dokon�en�"
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybran� �koly"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7609
-#: calendar/gui/e-week-view.c:4263
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknout pro p�id�n� �kolu"
@@ -5173,12 +5177,12 @@ msgstr "Odstranit tento v�_skyt"
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _v�echny v�skyty"
 
-#: calendar/gui/e-day-view.c:4135 calendar/gui/e-week-view.c:3890
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
 #: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Zd� se, �e nem�te nainstalovan� n�stroje pro PalmPilota GNOME."
 
-#: calendar/gui/e-day-view.c:4141 calendar/gui/e-week-view.c:3896
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
 #: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
@@ -5237,17 +5241,17 @@ msgstr "Stav"
 
 #: calendar/gui/e-itip-control.c:808 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:478
+#: calendar/gui/itip-utils.c:500
 msgid "Accepted"
 msgstr "Akceptov�no"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:481
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "P�edb�n� akceptov�no"
 
 #: calendar/gui/e-itip-control.c:816 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:484 calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Zam�tnuto"
 
@@ -5257,7 +5261,7 @@ msgstr "Zam�tnuto"
 #: 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:894 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nezn�m�"
@@ -5303,7 +5307,7 @@ msgstr "Aktualizovat stav respondenta"
 msgid "Send Latest Information"
 msgstr "Poslat nejnov�j�� informace"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:498
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zru�it"
@@ -5490,8 +5494,9 @@ msgstr "Nastala chyba v syst�mu CORBA\n"
 msgid "Object could not be found\n"
 msgstr "Objekt nelze nal�zt\n"
 
-#: calendar/gui/e-itip-control.c:1517 calendar/gui/e-itip-control.c:1609
-msgid "You don't have permissions to update the calendar\n"
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Nem�te pr�va k aktualizaci kalend��e\n"
 
 #: calendar/gui/e-itip-control.c:1520
@@ -5515,6 +5520,11 @@ msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav ��astn�ka nen� mo�n� aktualizovat, proto�e jeho stav nen� platn�!\n"
 
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Nem�te pr�va k aktualizaci kalend��e\n"
+
 #: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Stav ��astn�ka byl zaktualizov�n\n"
@@ -5733,36 +5743,43 @@ msgstr "_Za��tek sch�zky:"
 msgid "Meeting _end time:"
 msgstr "_Konec sch�zky:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1987
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otev�r�m �koly na %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepoda�ilo se na��st �koly v `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda pot�ebn� pro na�ten� `%s' nen� podporov�na"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nem�te pr�va k otev�en� adres��e v `%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Chyba p�i uskladn�n� `%s': %s"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Dokon�uji �koly..."
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Ma�u vybran� objekty..."
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "�ist�m"
@@ -5787,7 +5804,7 @@ msgstr "Metoda vy�adovan� k otev�eni `%s' nen� podporov�na"
 msgid "Adding alarms for %s"
 msgstr "Alarm na %s"
 
-#: calendar/gui/gnome-cal.c:1745
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5795,7 +5812,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5803,12 +5820,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otev�r�m kalend�� na %s"
 
-#: calendar/gui/gnome-cal.c:2009
+#: calendar/gui/gnome-cal.c:2029
 msgid "Opening default tasks folder"
 msgstr "Otev�r�m v�choz� slo�ku �kol�"
 
@@ -5868,56 +5885,56 @@ msgstr "��jen"
 msgid "September"
 msgstr "z���"
 
-#: calendar/gui/itip-utils.c:371
-msgid "At least one attendee is necessary"
-msgstr "Alespo� jeden ��astn�k je nezbytn�"
-
-#: calendar/gui/itip-utils.c:407
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Mus� b�t stanoven organiz�tor."
 
-#: calendar/gui/itip-utils.c:450 calendar/gui/itip-utils.c:559
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Alespo� jeden ��astn�k je nezbytn�"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Informace o ud�losti"
 
-#: calendar/gui/itip-utils.c:452 calendar/gui/itip-utils.c:561
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/itip-utils.c:454 calendar/gui/itip-utils.c:563
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informace o den�ku"
 
-#: calendar/gui/itip-utils.c:456 calendar/gui/itip-utils.c:580
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informace o voln�m/obsazen�m �ase"
 
-#: calendar/gui/itip-utils.c:458
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informace o kalend��i"
 
-#: calendar/gui/itip-utils.c:494
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Aktualizov�no"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:574
+#: calendar/gui/itip-utils.c:596
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Inform�cie o vo�nom �ase (%s do %s)"
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:608
 msgid "iCalendar information"
 msgstr "Inform�cie iCalendar"
 
-#: calendar/gui/itip-utils.c:744
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Mus�te b�t ��astn�kem ud�losti."
 
@@ -6152,7 +6169,7 @@ msgid "Print Calendar"
 msgstr "Tisknout kalend��"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3166
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Prohl��en� p�ed tiskem"
@@ -6174,7 +6191,7 @@ msgstr "Nen� mo�n� vytvo�it p�ehled �kol�. Ov��te nastaven� ORBit a OAF."
 msgid "The URI of the tasks folder to display"
 msgstr "URI, kter� bude zobrazovat adres�� �kol�"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6186,12 +6203,12 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto �koly?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2646
-#: mail/mail-callbacks.c:2888
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "P���t� se neptat."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Tisknout �koly"
 
@@ -6258,15 +6275,15 @@ msgstr "Nelze z�skat seznam ukl�d�n� z registru: %s"
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "P�ipom�nka!!"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Ud�losti kalend��e"
 
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6274,7 +6291,7 @@ msgstr ""
 "Evolution na�la soubory kalend��e Gnome.\n"
 "Chcete je importovat do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Kalend�� Gnome"
 
@@ -8418,7 +8435,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Neplatn� odpov�� na ov��en� od serveru."
 
@@ -8711,7 +8728,7 @@ msgstr "Pou�it� kl��e nepodporuje certifikovan� podpis"
 msgid "Error in application verification"
 msgstr "Chyba v ov��en� aplikace"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8724,11 +8741,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr "DOB�E"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr "�PATN�"
 
@@ -8752,7 +8769,7 @@ msgstr ""
 "Chcete ho p�esto akceptovat?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8810,13 +8827,13 @@ msgstr "Nen� mo�n� p�emenovat adres��: %s: Adres�� neexistuje"
 #: 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:2617
+#: camel/providers/imap/camel-imap-store.c:2641
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Operace zru�en�"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2620
+#: camel/providers/imap/camel-imap-store.c:2644
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neo�ak�vane zru�il spojen�: %s"
@@ -8854,33 +8871,33 @@ msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nen� mo�n� vytvo�it adres�� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Nen� mo�n� na��st s�hrn pro %s"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 #, fuzzy
 msgid "Folder was destroyed and recreated on server."
 msgstr "Adres�� byl zni�en� a znovu vytvo�en� na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Hlad�m zm�n�n� zpr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepoda�ilo se p�ijat zpr�vu"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8896,7 +8913,7 @@ msgstr ""
 "Nelze z�skat zpr�vu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
@@ -8904,18 +8921,18 @@ msgstr ""
 msgid "No such message"
 msgstr "Tak� zpr�va neexistuje"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2429
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Tato zpr�va nen� pr�v� dostupn�"
 
-#: camel/providers/imap/camel-imap-folder.c:2093
-#: camel/providers/imap/camel-imap-folder.c:2163
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 #, fuzzy
 msgid "Fetching summary information for new messages"
 msgstr "S�ahuji s�hrnn� inform�c� pro nov� zpr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:2467
+#: camel/providers/imap/camel-imap-folder.c:2565
 #, fuzzy
 msgid "Could not find message body in FETCH response."
 msgstr "Nen� mo�n� nal�zt telo zpr�vy v odpovedi FETCH."
@@ -9011,7 +9028,7 @@ msgstr "Spojen� zru�eno"
 
 #: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nelze spojit s %s (port %d): %s"
@@ -9034,33 +9051,28 @@ msgstr "Operace nepodporovan�"
 msgid "SSL negotiations failed"
 msgstr "Ov��en� selhalo."
 
-#: camel/providers/imap/camel-imap-store.c:941
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr "Slo�ka %s ji� neexistuje"
-
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s nepodporuje po�adovan� typ ov��en� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Typ ov��en� %s nen� podporov�n"
 
-#: camel/providers/imap/camel-imap-store.c:1109
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sUve�te IMAP heslo pro %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1124
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Neuvedli jste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1153
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9071,24 +9083,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1451
-#: camel/providers/imap/camel-imap-store.c:1593
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Adres�� %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1794
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Jm�no adres��e nesm� obsahovat znak Enter."
 
-#: camel/providers/imap/camel-imap-store.c:1806
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezn�m� chyba: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1842
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodi�ovsk� slo�ka nem��e obsahovat podslo�ky"
 
@@ -9975,42 +9987,42 @@ msgstr "Do�asn� selhan� ov��en�."
 msgid "Authentication required"
 msgstr "Je po�adov�no ov��en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Chyba odpovede QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nepoda�ilo se spojit se SMTP serverem %s v bezpe�n�m modu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr "server pravd�podobn� nepodporuje SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypr�al �as po��davky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s nepodporuje po�adovan� typ ov��en� %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sUve�te SMTP heslo pro %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10021,91 +10033,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: 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:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doru�en� po�ty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Zpr�vu nelze poslat: adresa odes�latele je neplatn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Pos�l�m zpr�vu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Nelze poslat zpr�vu: nebyli ur�eni p��jemci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nelze poslat zpr�vu: jeden nebo v�ce neplatn�ch p��jemc�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP ov��en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 #, fuzzy
 msgid "Error creating SASL authentication object."
 msgstr "Chyba p�i vytv�ran� ov��ovac�ho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypr�al �as po��davky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Po��davka AUTH selhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatn� odpove� na ov��en� od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, fuzzy, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Chyba odpov�di MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, fuzzy, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> selhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypr�al �as pos�lan� DATA: %s: po�ta neodoslan�"
@@ -10113,38 +10125,38 @@ msgstr "Vypr�al �as pos�lan� 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypr�al �as pos�lan� DATA: konec zpr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukon�en� DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, fuzzy, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Vypr�al �as po��davky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Chyba odpov�di QUIT"
 
@@ -10164,7 +10176,7 @@ msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "priloha"
 
@@ -10285,7 +10297,7 @@ msgstr "P�ipojit soubor"
 msgid "Could not create a PGP signature context"
 msgstr "Nelze vytvo�it kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10294,34 +10306,34 @@ msgstr ""
 "Chyba p�i �ten� souboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Varov�n�!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Soubor existuje, p�epsat?"
 
-#: composer/e-msg-composer.c:1182
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba p�i ukl�d�n� souboru: %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba p�i na��t�n� souboru: %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba p�i p��stupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1243
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nelze obdr�et zpr�vu z editoru"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10330,7 +10342,7 @@ msgstr ""
 "Nelze hledat v souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10339,7 +10351,7 @@ msgstr ""
 "Nelze rozd�lit soubor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10348,7 +10360,7 @@ msgstr ""
 "Chyba p�i automatickem ukl�dan� zpr�vy: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1366
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10356,7 +10368,7 @@ msgstr ""
 "Ximian Evolution na�la neulo�en� soubory z p�edchoz�ho sezen�.\n"
 "Chcete se pokusit o jejich obnoven�?"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1525
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10367,27 +10379,27 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:1531
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Varov�n�: Zm�n�n� zpr�va"
 
-#: composer/e-msg-composer.c:1564
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Otev��t soubor"
 
-#: composer/e-msg-composer.c:1922
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:1963 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr "automatick�"
 
-#: composer/e-msg-composer.c:2150 composer/e-msg-composer.c:2774
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Napsat zpr�vu"
 
-#: composer/e-msg-composer.c:2791
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10395,7 +10407,18 @@ msgstr ""
 "Nelze vytvo�it okno pro psan� zpr�v:\n"
 "Nelze aktivovat ovl�dac� prvek pro v�b�r adresy."
 
-#: composer/e-msg-composer.c:2817 composer/e-msg-composer.c:2872
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Nelze vytvo�it okno pro psan� zpr�v:\n"
+"Nelze aktivovat komponent HTML editor."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10403,13 +10426,13 @@ msgstr ""
 "Nelze vytvo�it okno pro psan� zpr�v:\n"
 "Nelze aktivovat komponent HTML editor."
 
-#: composer/e-msg-composer.c:3851
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10417,8 +10440,9 @@ msgstr ""
 "Nelze vytvo�it okno pro psan� zpr�v, proto�e jste je�te\n"
 "nenastavili ��dnou identitu pro komponent po�ty."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Nelze inicializovat editor zpr�v Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10469,8 +10493,8 @@ msgstr "P�edm�t obsahuje"
 msgid "Subject does not contain"
 msgstr "P�edm�t neobsahuje"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2513
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10618,7 +10642,8 @@ msgid "years"
 msgstr "roky/let"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Zapomn�l(-a) jste vybrat datum."
 
 #: filter/filter-datespec.c:269
@@ -10671,14 +10696,11 @@ msgid "Add action"
 msgstr "P�idat akci"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Zapomn�l(-a) jste vybrat slo�ku.\n"
-"Vra�te se a zadejte platnou slo�ku pro doru�ov�n� po�ty."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Mus�te uv�st jm�no souboru:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
 #: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Vybrat slo�ku"
@@ -10692,7 +10714,7 @@ msgstr ""
 "Chyba v regul�rn�m v�razu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "D�le�it�"
@@ -10869,225 +10891,225 @@ msgid "Beep"
 msgstr "P�p"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kop�rovat do slo�ky"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Datum p�ijet�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Datum odesl�n�"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Smaz�no"
 
-#: 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
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nezn� jako"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "neza��n� na"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Koncept"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "kon�� na"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "V�raz"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 #, fuzzy
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: 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 "je p�ed"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je ozna�en�"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je v�ce ne�"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je m�n� ne�"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nen�"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nen� ozna�en�"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr "�t�tek"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Po�tovn� konference"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "T�lo zpr�vy"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Hlavi�ka zpr�vy"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "P�esunout do slo�ky"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 msgid "Pipe Message to Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "P�ehr�t zvuk:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "��st"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "P��jemce"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Regex Match"
 msgstr "Regul. v�raz"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Odpov�zeno komu:"
 
-#: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "je v�ce ne�"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "je men� ne�"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:29
 msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:51 mail/mail-callbacks.c:1807
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Odes�latel"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Nastavit stav"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Vykonat p��kaz"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:55
-msgid "sounds like"
-msgstr "vypad� jako"
-
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Zdrojov� ��et"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifick� hlavi�ka"
 
-#: filter/libfilter-i18n.h:58
-msgid "starts with"
-msgstr "za��n� na"
-
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Zastavit zpracov�n�"
 
-#: filter/libfilter-i18n.h:61 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "P�edm�t"
 
-#: filter/libfilter-i18n.h:62
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Nastavit stav"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "nekon�� na"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:45
+msgid "does not return"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "nezn� jako"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "neza��n� na"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "kon�� na"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "je ozna�en�"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "je po"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "je p�ed"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "je v�ce ne�"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "je m�n� ne�"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "nen� ozna�en�"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "nen�"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "je v�ce ne�"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "je men� ne�"
+
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "vypad� jako"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "za��n� na"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravidla"
@@ -11145,7 +11167,7 @@ msgstr "Prohled�v�m %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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Po�ta"
 
@@ -11423,7 +11445,8 @@ msgid "Post a new mail message"
 msgstr "Poslat novou zpr�vu"
 
 #: mail/component-factory.c:1078
-msgid "Cannot initialize Evolution's mail component."
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Nelze inicializovat komponent po�ty Evolution."
 
 #: mail/component-factory.c:1087
@@ -11442,16 +11465,16 @@ msgstr "P�ipojuji se..."
 msgid "Cannot register storage with shell"
 msgstr "Nelze zaregistrovat sklad u shellu"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:886
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nelze vytvo�it do�asn� adres��: %s"
@@ -11814,9 +11837,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "Pos�l�te zpr�vu v HTML form�tu, av�ak n�sleduj� p��jemci si nep�ej� dost�vat "
 "zpr�vy v HTML form�tu:\n"
@@ -11868,31 +11892,31 @@ msgstr ""
 "Nei je mo�n� otev��t adres�� na koncepty pro tento ��et.\n"
 "Chcete pou��t standardn� adres�� na koncepty?"
 
-#: mail/mail-callbacks.c:1183
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "nezn�m� odes�latel"
 
-#: mail/mail-callbacks.c:1187
+#: mail/mail-callbacks.c:1210
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "D�a %a, %Y-%m-%d at %H:%M, %%s napsal:"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "P�esunout zpr�vu do"
 
-#: mail/mail-callbacks.c:1690 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Kop�rovat zpr�vu do"
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2380
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Opravdu chcete upravit v�etk�ch %d zpr�v?"
 
-#: mail/mail-callbacks.c:2382
+#: mail/mail-callbacks.c:2405
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -11901,7 +11925,7 @@ msgstr ""
 "Upravovat m��ete pouze zpr�vy ulo�en�\n"
 "v adres��e Koncepty."
 
-#: mail/mail-callbacks.c:2421
+#: mail/mail-callbacks.c:2444
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -11910,33 +11934,33 @@ msgstr ""
 "Pouze zpr�vy z adres��e Odoslan� je mo�n�\n"
 "znovu poslat."
 
-#: mail/mail-callbacks.c:2435
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Opravdu chcete p�eposlat v�ech(-ny) %d zpr�v(-y)?"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2484
 #, fuzzy
 msgid "No Message Selected"
 msgstr "��dna vybran� zpr�va"
 
-#: mail/mail-callbacks.c:2506 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "P�epsat soubor?"
 
-#: mail/mail-callbacks.c:2560
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Ulo�it zpr�vu jako..."
 
-#: mail/mail-callbacks.c:2562
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Ulo�it zpr�vy jako..."
 
-#: mail/mail-callbacks.c:2631
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "J�t do dal�� slo�ky s nep�e�ten�mi zpr�vami?"
 
-#: mail/mail-callbacks.c:2638
+#: mail/mail-callbacks.c:2661
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11944,7 +11968,7 @@ msgstr ""
 "V t�to slo�ce nejsou ��dn� dal�� nov� zpr�vy.\n"
 "Chcete j�t do dal�� slo�ky?"
 
-#: mail/mail-callbacks.c:2881
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11956,7 +11980,7 @@ msgstr ""
 "\n"
 "Opravdu vymazat tyto zpr�vy?"
 
-#: mail/mail-callbacks.c:2994
+#: mail/mail-callbacks.c:3017
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11965,30 +11989,30 @@ msgstr ""
 "Chyba p�i na��tavan� inform�c� o filtrech:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3006
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:3050
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Str�nka %d z %d"
 
-#: mail/mail-callbacks.c:3105
+#: mail/mail-callbacks.c:3128
 #, fuzzy
 msgid "Print Message"
 msgstr "Tiskit zpr�vu"
 
-#: mail/mail-callbacks.c:3132
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "A4"
 
-#: mail/mail-callbacks.c:3173
+#: mail/mail-callbacks.c:3196
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Tisk zpr�vy selhala"
 
-#: mail/mail-callbacks.c:3363
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Opravdu chcete otev��t v�ech(-ny) %d zpr�v(-y) v samostatn�ch oknech?"
@@ -12009,7 +12033,7 @@ msgstr "Bez popisu"
 msgid "Please specify a valid script name"
 msgstr "Uve�te platn� jm�no skriptu"
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2946
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr "Beze jm�na"
 
@@ -12017,12 +12041,12 @@ msgstr "Beze jm�na"
 msgid "en"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:870
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "P�idat krit�rium"
 
-#: mail/mail-composer-prefs.c:871
+#: mail/mail-composer-prefs.c:873
 msgid "Add Signature"
 msgstr "P�idat podpis"
 
@@ -12082,17 +12106,17 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Spr�vodca ��tem Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "��et %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 #, fuzzy
 msgid "Checking Service"
 msgstr "Kontroluji slu�bu"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "P�ipojuji se k serveru..."
 
@@ -12810,77 +12834,77 @@ msgstr "Nepoda�ilo se vytvo�it kontext ob�lky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepoda�ilo se vytvo�it kontext dek�dovan� S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Ulo�it p��lohu"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nen� mo�n� vytvo�it do�asn� soubor '%s': %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 msgid "Save Attachment..."
 msgstr "Ulo�it p��lohu..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 #, fuzzy
 msgid "View Inline"
 msgstr "Zobrazit v texte"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Otev��t v %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobrazit v text (pomocou %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 #, fuzzy
 msgid "Hide"
 msgstr "Zkryt"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 #, fuzzy
 msgid "External Viewer"
 msgstr "Extern� zobrazova�"
 
-#: mail/mail-display.c:1285
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr "Stahov�n� obr�zk�"
 
-#: mail/mail-display.c:1460
+#: mail/mail-display.c:1494
 #, fuzzy
 msgid "Loading message content"
 msgstr "Na��tavam obsah zpr�vy"
 
-#: mail/mail-display.c:1747
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr "�koly po term�nu:"
 
-#: mail/mail-display.c:1751
+#: mail/mail-display.c:1785
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "by %B %d, %Y, %1:%M %P"
 
-#: mail/mail-display.c:2078
+#: mail/mail-display.c:2112
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Otev��t odkaz v p�ehl�da�i"
 
-#: mail/mail-display.c:2079
+#: mail/mail-display.c:2113
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Kop�rovat um�st�n� odkazu"
 
-#: mail/mail-display.c:2081
+#: mail/mail-display.c:2115
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Ulo�it odkaz jako"
 
-#: mail/mail-display.c:2083
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Ulo�it obr�zek jako..."
@@ -13291,20 +13315,20 @@ msgstr "�ek�m..."
 msgid "User canceled operation."
 msgstr "U�ivatel zru�il operaci."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Zapamatovat si toto heslo"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamatovat si toto heslo pro zbytek tohoto sezen�"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
@@ -13329,8 +13353,9 @@ msgstr ""
 "Chcete ulo�it zm�n�?"
 
 #: mail/mail-signature-editor.c:372
-msgid "Type the name by which you would like to refer to this signature."
-msgstr "Napi�te jm�no, kter� m� odkazovat na tento podpis."
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML podpis:"
 
 #: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
@@ -13581,41 +13606,41 @@ msgstr "Term�n dokon�en�"
 msgid "_Flag:"
 msgstr "Meno s�boru:"
 
-#: mail/subscribe-dialog.c:228
+#: mail/subscribe-dialog.c:229
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "P�ech�dzam adres��y pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "P�ech�dzam kore�ov� adres��y na \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "P�ihlasuji si adres�� \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasuji se z adres��e \"%s\""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Slo�ka"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Ulo�it v adres��e..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Nebyl vybr�n server"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Vyberte server"
 
@@ -27209,6 +27234,19 @@ msgstr "P�emenovat adres��"
 msgid "The specified folder name is not valid: %s"
 msgstr "Zadan� jm�no adres��e nen� platn�: %s"
 
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Nen� mo�n� p�emenovat adres��:\n"
+"%s"
+
 #: shell/e-shell-folder-creation-dialog.c:122
 #, fuzzy, c-format
 msgid ""
@@ -27222,7 +27260,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Vytvo�it novou slo�ku"
 
-#: shell/e-shell-folder-selection-dialog.c:381
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nov�..."
 
@@ -27256,20 +27294,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Pros�m, vyberte inform�c�, kter� chcete importovat:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, fuzzy, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importuji %s\n"
-"Import�r nen� p�ipraven�.\n"
-"�ak�m 5 sek�nd a sk�sim to znovu."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, fuzzy, c-format
 msgid ""
 "Importing %s\n"
@@ -27278,23 +27303,23 @@ msgstr ""
 "Importuji %s\n"
 "Importuji polo�ku %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Vybrat adres��"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Soubor %s neexistuje"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -27304,12 +27329,12 @@ msgstr ""
 "%s\n"
 "nen� k dispozici import�r."
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, fuzzy
 msgid "Importing"
 msgstr "Importuji"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, fuzzy, c-format
 msgid ""
 "Importing %s.\n"
@@ -27318,17 +27343,17 @@ msgstr ""
 "Importuji %s\n"
 "Za��nam %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Chyba p�i starte %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Chyba p�i na��tavan� %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, fuzzy, c-format
 msgid ""
 "Importing %s\n"
@@ -27337,32 +27362,32 @@ msgstr ""
 "Importuji %s\n"
 "Importuji polo�ku 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatick�"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Jm�no souboru:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "unless"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Typ souboru:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 #, fuzzy
 msgid "Import data and settings from older programs"
 msgstr "Importovat d�ta a nastaven� se star��ch program�"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importovat jednotliv� soubor"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 #, fuzzy
 msgid ""
 "Please wait...\n"
@@ -27371,25 +27396,25 @@ msgstr ""
 "Pros�m, �akejte...\n"
 "Hlad�m existuj�c� nastaven�"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 #, fuzzy
 msgid "Starting Intelligent Importers"
 msgstr "Sp���am inteligentn� importy"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Vybrat slo�ku"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Vybrat slo�ku, do kter� maj� b�t importov�na tato data"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importovat"
 
@@ -27421,27 +27446,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Nastaven� Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Otv�ram adres�� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otv�ram adres�� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Otev��t v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Nelze otev��t sd�lenou slo�ku: %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -27503,33 +27528,33 @@ msgstr "Ned� se spustit n�stroj pro oznamovan� ch�b"
 msgid "About Ximian Evolution"
 msgstr "O Xim�n Evolution"
 
-#: shell/e-shell-view-menu.c:491
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "J�t na slo�ku..."
 
-#: shell/e-shell-view-menu.c:492
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Vyberte slo�ku, kterou chcete otev��t"
 
-#: shell/e-shell-view-menu.c:613
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Vytvo�it novou zkratku"
 
-#: shell/e-shell-view-menu.c:614
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte slo�ku, ke kter� m� zkratka v�st:"
 
-#: shell/e-shell-view-menu.c:773
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: shell/e-shell-view-menu.c:786 ui/evolution.xml.h:65
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Pracovat p�i odpojen�"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:41
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Pracovat p�i odpojen�"
 
@@ -27611,7 +27636,7 @@ msgstr "Nen� mo�n� zaregistrovat u OAF"
 msgid "Configuration Database not found"
 msgstr "Konfigura�n� datab�za nenalezen�"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 #, fuzzy
 msgid "Generic error"
 msgstr "V�eobecn� chyba"
@@ -27794,7 +27819,7 @@ msgstr "P�ejmenovat vybranou zkratku na:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Otev��t slo�ku s odkazem na tuto zkratku"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:25
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otev��t v _nov�m okn�"
 
@@ -27831,64 +27856,64 @@ msgstr "Zkratky"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "��dn� chyba"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Slo�ka se stejn�m jm�nem ji� existuje"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Uveden� typ adres��e nen� platn�"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 #, fuzzy
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Pro vytvo�en� slo�ky nen� dostatek m�sta"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Slo�ka nen� pr�zdn�"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Uveden� slo�ka nebyla nalezena"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Funkc� nen� v tomto sklade implementovan�"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operace nen� podporovan�"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Uveden� typ nen� podporovan� t�mto skladem"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uveden� slo�ka nem��e b�t upravov�na ani odstran�na"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nen� mo�n� p�esunout adres�� do jednoho se svoj�ch podpr��ink�."
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Nelze vytvo�it slo�ku s t�mto jm�nem"
 
-#: shell/e-storage.c:516
+#: shell/e-storage.c:586
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -28111,7 +28136,7 @@ msgstr ""
 #, 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. "
 msgstr ""
@@ -28132,30 +28157,25 @@ msgstr "N�stroj Evolution pro import"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "N�stroj Evolution pro import"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Import souboru (krek 3 z 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 #, fuzzy
 msgid "Importer Type (step 1 of 3)"
 msgstr "Typ importu (krek 1 z 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 #, fuzzy
 msgid "Select Importers (step 2 of 3)"
 msgstr "Vyberte import�r (krek 2 z 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Vyberte soubor (krek 2 z 3)"
 
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -28382,10 +28402,10 @@ msgstr "Zobrazit aktu�ln� kontakt"
 #: 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:16
+#: 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:44
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Akce"
 
@@ -28490,7 +28510,7 @@ msgid "Delete this item"
 msgstr "Smazat tuto polo�ku"
 
 #: 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:20
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Main toolbar"
 msgstr "Hlavn� panel n�stroj�"
@@ -28531,7 +28551,7 @@ msgstr "Ulo�it tuto 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:48
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Soubor"
 
@@ -28614,7 +28634,7 @@ msgstr "Napl�novat sch�zku k t�to polo�ce"
 
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "Customise My Evolution"
+msgid "Customize My Evolution"
 msgstr "P�isp�sobit moje Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -28665,32 +28685,32 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:13
 #, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_P�ihlasit adres��y..."
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
 msgid "Show message preview window"
 msgstr "Zobrazit okno s n�hladem zpr�vy"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "P�ihlasit nebo odhlasit adres��y na vzd�len�ch serverech"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtu�ln� slo�ky..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "_N�hlad"
 
-#: ui/evolution-mail-global.xml.h:19
-#, fuzzy
-msgid "_Subscribe to Folders..."
-msgstr "_P�ihlasit adres��y..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Zm�nit vlastnosti t�to slo�ky"
@@ -28784,7 +28804,7 @@ msgstr "Seznam zpr�v dle vl�ken"
 msgid "_Expunge"
 msgstr "_Vymazat"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:49
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Slo�ka"
 
@@ -29088,7 +29108,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Vyhledat text v t�le zobrazen� zpr�vy"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Nastavit str�nku pro aktu�ln� tisk�rnu"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -29197,7 +29218,7 @@ msgstr "_Citace"
 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:65
 msgid "_Tools"
 msgstr "_N�stroje"
 
@@ -29212,12 +29233,12 @@ msgstr "Zav��t 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:45
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "U_zav��t"
 
 #: 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:66
 msgid "_View"
 msgstr "_Zobrazen�"
 
@@ -29400,7 +29421,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Ulo�it aktu�ln� soubor a zav��t okno"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:53
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "N�_pov�da"
 
@@ -29561,157 +29582,171 @@ msgid "Exit the program"
 msgstr "Ukon�it program"
 
 #: ui/evolution.xml.h:18
-msgid "Full_screen"
-msgstr "Cel�_obrazovka"
-
-#: ui/evolution.xml.h:19
 msgid "Import data from other programs"
 msgstr "Importovat data z jin�ch program�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "P�esunout tuto slo�ku na jin� m�sto"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open Other _User's Folder..."
 msgstr "Otev��t slo�ku _jin�ho u�ivatele..."
 
-#: ui/evolution.xml.h:23
-msgid "Open a folder that is made available by some other user on the server"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Open a folder belonging to some other user on the server"
 msgstr "Otev��t slo�ku, kter� je zp��stupn�na jin�m u�ivatelem na serveru"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otev��t v nov�m oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otev��t tuto slo�ku v jin�m okn�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Pi_lot Settings..."
 msgstr "Nastaven� di��e _Pilot..."
 
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "P�edb�n� nastaven�..."
+
 #: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Otev��t slo�ku jin�ho u�ivatele"
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Odeslat / p�ijmout"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr "Poslat polo�ky �ekaj�c� ve front� a p�ijmout nov� polo�ky"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Nastaven� po�ty"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Nastaven� po�ty"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Uk�zat informace o Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "Po�le zpr�vu o chybe"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Poslat zpr�vu o chybe"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Po�le zpr�vu o chybe pomocou n�stroja pro oznamovan� ch�b P��tel v n�dzi."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "P�ep�na�"
 
-#: ui/evolution.xml.h:36
-msgid "Toggle fullscreen mode"
-msgstr "P�epnout celoobrazovkov� re�im"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "P�epne, �i se m� zobrazovat panel adres���"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "P�epne, �i se m� zobrazovat panel zkratek"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "P�epne, �i pracujete on nebo off-line."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Zobrazit vybran� adres��"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Xim�n Evolution _FAQ"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "O Xim�n _Evolution..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kop�rovat..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Li�ta _slo�ek"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "Sl_o�ka..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_J�t na slo�ku..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "I_mportovat..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_P�esunout..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nov�"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nov� adres��"
 
-#: ui/evolution.xml.h:58
-msgid "_Preferences..."
-msgstr "_Volby..."
-
 #: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "Otev��t slo�ku jin�ho u�ivatele"
+
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "P�e_jmenovat..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Odeslat / p�ijmout"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Nastavenie _po�ty..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Z_kratkov� li�ta"
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr "_Zkratka"
 
@@ -30034,6 +30069,42 @@ msgstr "init_corba(): Nen� mo�n� inic�lizovat GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nen� mo�n� inic�lizovat Bonobo"
 
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Slo�ka %s ji� neexistuje"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Zapomn�l(-a) jste vybrat slo�ku.\n"
+#~ "Vra�te se a zadejte platnou slo�ku pro doru�ov�n� po�ty."
+
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr "Napi�te jm�no, kter� m� odkazovat na tento podpis."
+
+#, fuzzy
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importuji %s\n"
+#~ "Import�r nen� p�ipraven�.\n"
+#~ "�ak�m 5 sek�nd a sk�sim to znovu."
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "N�stroj Evolution pro import"
+
+#~ msgid "Full_screen"
+#~ msgstr "Cel�_obrazovka"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "P�epnout celoobrazovkov� re�im"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Volby..."
+
 #, fuzzy
 #~ msgid "Could not parse query string"
 #~ msgstr "Nie je mo�n� spracova� URL `%s'"
@@ -30562,10 +30633,6 @@ msgstr "init_bonobo(): Nen� mo�n� inic�lizovat Bonobo"
 #~ msgstr "Odstr�ni� v�etko okrem podpisu"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML podpis:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML podpis:"
 
@@ -30913,9 +30980,6 @@ msgstr "init_bonobo(): Nen� mo�n� inic�lizovat Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "�_loha..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Nastavenie _po�ty..."
-
 #~ msgid "_Apply Filters"
 #~ msgstr "_Pou�i� filtre"
 
diff --git a/po/da.po b/po/da.po
index 40cfedb7eb..07479cd26f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-03-08 23:41+0100\n"
 "Last-Translator: Anna Jonna Armannsdottir <a@ingenioer.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -320,11 +320,17 @@ msgstr "Efternavn"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Kontaktliste uden navn"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -335,47 +341,47 @@ msgstr "VCard for %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "S�ger..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Indl�ser..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Kobler til LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Tilf�jer kort p� LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "�ndrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Modtager s�geresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fejl ved fjernelse af kort"
@@ -394,13 +400,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-server"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
@@ -467,10 +473,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik til styring af eksempel-adressebogen"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakter"
@@ -487,29 +493,39 @@ msgstr "LDAP-server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Mappe som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Opret en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Opret en ny kontaktliste"
@@ -558,7 +574,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
@@ -566,11 +582,11 @@ msgstr "Kunne ikke initiere gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -578,7 +594,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:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -589,7 +605,7 @@ msgstr ""
 "at du har indtastet en ugyldig URI, eller at LDAP-serveren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -601,7 +617,7 @@ msgstr ""
 "m� du overs�tte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra henvisningen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -612,38 +628,51 @@ msgstr ""
 "at du har indtastet en ugyldig URI, eller at LDAP-serveren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"Kunne ikke autenticere mod IMAP-server.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Indtast adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "slutter med"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "slutter med"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -651,7 +680,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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 +688,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappe-skimmeren vil vise"
 
@@ -744,53 +773,53 @@ msgid "  S_how Supported Bases "
 msgstr "_S�g efter underst�ttede typer"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Alternativer"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " Fje_rn"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " Fje_rn"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Alternativer"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -927,48 +956,54 @@ msgstr "�n"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "S�_geomr�de:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "S�ger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "V�lg alt"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Slettet"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -979,7 +1014,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -988,47 +1023,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Kildeinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Kobler til server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Et ikke underst�ttet skema"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1036,7 +1071,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1045,7 +1080,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1053,7 +1088,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1063,7 +1098,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1073,27 +1108,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1103,7 +1138,7 @@ msgstr ""
 "Dette navn vil bruges til at identificere din konto. Det bruges kun for "
 "visning p� sk�rmen."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1111,11 +1146,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1124,25 +1159,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "De_tte er postadressen"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1150,49 +1185,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Tilf�j"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Tilf�j"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Tilf�j handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Tilf�j handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmer"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Slet alle"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Vis"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1202,102 +1237,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_edig�r"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "R_edig�r aftale"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Tilvalg"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "S�ge_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Uds�t-tid (minutter)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "kontakt-liste-redigering"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Kobler til %s igen"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "S�ger..."
@@ -1312,8 +1347,8 @@ msgstr "Fabrik til adressebogens gr�nseflade for navnevalg"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1344,11 +1379,11 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "V�lg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "Afsender indeholder"
@@ -1422,7 +1457,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1482,13 +1517,13 @@ msgstr "�nsker at modtage e-post som _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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1516,1029 +1551,1029 @@ msgstr "URL for _Offentlig kalender:"
 msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "U.S.A."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algeriet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: 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:141
 msgid "Armenia"
 msgstr "Armenien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "�strig"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Hviderusland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien og Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Bouvet�en"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havomr�de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Brunei Dar-es-salam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Cayman-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Centralafrikanske republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Kina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Jule�en"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling)-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Columbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komorene"
 
-#: 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
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Cook-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Cypern"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Tjekkiske republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikanske republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "�st-Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "�kvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "�kvatorial Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklands�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "F�r�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Frankrig"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Fransk Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Fransk polynesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Tyskland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Gr�kenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Gr�nland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Heard og McDonald-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "D�dehavet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Indien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Den koreanske republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kurgistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Letland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: 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:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Makedonien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldiverne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Marshall�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Den koreanske republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Hollandske Antiller"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Ny-kaledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk-�en"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "Nordre Mariana-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Palestinensisk omr�de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Ny Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filippinerne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "R�union"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rum�nien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Rusland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent og grenadinerne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome og Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seyschellene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Solomon�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sydafrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Syd Georgia og de sydlige sandwich-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre og Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sverige"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Svejts"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Republikken Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Tyrkiet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Turks og Caicos-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "De forenede arabiske emirater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende �er"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "U.S. Jomfru�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "U.S. Jomfru�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-�erne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Vestlige Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
@@ -2575,20 +2610,20 @@ 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Hurtig kontakt-tilf�jelse"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 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:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-post"
 
@@ -2610,6 +2645,19 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
+#: 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Overskriv fil?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2740,7 +2788,7 @@ msgstr "kontakt-liste-redigering"
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2790,7 +2838,7 @@ msgstr ""
 "eksisterer allerede i denne mappe. Vil du tilf�je den alligevel?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Avanceret s�gning"
 
@@ -2799,25 +2847,25 @@ msgstr "Avanceret s�gning"
 msgid "Search"
 msgstr "S�gning"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Fejl under start af %s"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2829,10 +2877,10 @@ msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2840,7 +2888,7 @@ msgstr "Ukendt fejl"
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
@@ -2861,8 +2909,8 @@ msgstr "Protokollen er ikke underst�ttet"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Afbrudt"
 
@@ -2913,7 +2961,7 @@ msgstr "Fejl ved fjernelse af liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
@@ -2930,9 +2978,8 @@ msgstr "Vis"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3022,7 +3069,7 @@ msgstr "Adressebog"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
@@ -3108,7 +3155,7 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Inds�t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3116,8 +3163,8 @@ msgstr "Inds�t"
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3126,7 +3173,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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,�,�,�"
 
@@ -3134,11 +3181,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3274,7 +3321,7 @@ msgid "Include:"
 msgstr "Inklud�r:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Landskab"
 
@@ -3299,7 +3346,7 @@ msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -3322,7 +3369,7 @@ msgstr "Papirkilde:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portr�t"
 
@@ -3384,20 +3431,20 @@ msgstr "Unavngivet aftale"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "H�j"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Lav"
 
@@ -3408,13 +3455,17 @@ msgstr "Lav"
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalenderserveren"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke l�se pilotens kalender-applikationsblok"
 
@@ -3527,11 +3578,11 @@ msgstr "Uds�t-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edig�r aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Ingen beskrivelse tilg�ngelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3543,13 +3594,13 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for p�mindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3566,16 +3617,16 @@ msgstr ""
 "\n"
 "Er du sikker p�, at du �nsker at k�re dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Sp�rg mig ikke igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
@@ -3624,7 +3675,7 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3703,9 +3754,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3722,13 +3773,13 @@ msgid "Assigned"
 msgstr "Tildelt"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nej"
 
@@ -3748,82 +3799,102 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "M�nedsvisning"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og h�ndelser"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL for _Offentlig kalender:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mappe som indeholder aftaler og h�ndelser"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Udskriv kort"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mappe som indeholder opgaver"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Indstillinger for nyhedstjeneste"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�de"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Ny opgave"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
@@ -3866,29 +3937,30 @@ msgid "Alarm Repeat"
 msgstr "Gentagelse af 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 ""
+"Dette er en e-postp�mindelse, men Evolution underst�tter ikke denne type "
+"p�mindelser. Du vil ikke kunne redigere alternativerne 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:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Afspil lyd:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Gentag alarmen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "K�r 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 ""
-"Dette er en e-postp�mindelse, men Evolution underst�tter ikke denne type "
-"p�mindelser. Du vil ikke kunne redigere alternativerne for denne p�mindelse."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
@@ -3912,110 +3984,110 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d dage"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d uger"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 uge"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Vis en besked"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Send en besked"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "K�r et program"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udf�res"
 
-#: 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 f�r aftalen starter"
 
-#: 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 efter aftalen er startet"
 
-#: 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 ved aftalens start"
 
-#: 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 f�r aftalen slutter"
 
-#: 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 efter aftalens slutning"
 
-#: 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 ved aftalens slutning"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: 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 for en ukendt udl�sertype"
@@ -4036,7 +4108,7 @@ msgstr "P�mindelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4119,7 +4191,7 @@ msgid "Days"
 msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4132,7 +4204,7 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4142,7 +4214,7 @@ msgid "S_un"
 msgstr "S�_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "L�rdag"
 
@@ -4155,7 +4227,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -4174,7 +4246,7 @@ msgid "Task List"
 msgstr "O_pgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4191,7 +4263,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4200,7 +4272,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4428,8 +4500,8 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Gem som..."
 
@@ -4498,27 +4570,27 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "P�mindelse"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Genindtr�ffelse"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "M�deplanl�gning"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "M�de"
 
@@ -4587,19 +4659,19 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "En organisator er p�kr�vet."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 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:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4639,7 +4711,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
@@ -4651,7 +4723,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4727,48 +4799,48 @@ msgstr "."
 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:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Andre"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Anden fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "gentagelser"
 
@@ -4862,7 +4934,7 @@ msgstr "Dato for fuldf�relse:"
 
 #: 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Beh�ver handling"
 
@@ -4871,7 +4943,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4883,17 +4955,17 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Grundl�ggende"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4963,12 +5035,12 @@ msgid "100%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�bn"
@@ -4978,30 +5050,30 @@ msgstr "_�bn"
 msgid "_Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:995 calendar/gui/e-day-view.c:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5030,12 +5102,12 @@ msgstr "_Mark�r opgaver som fuldf�rte"
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilf�je en opgave"
@@ -5044,8 +5116,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:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Fuldf�rt"
 
@@ -5074,7 +5146,7 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Sammendrag"
@@ -5141,123 +5213,123 @@ msgstr " "
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "M�de"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguration"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfiguration"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ops�t _m�de"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Videresend som i_Calendar"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "G�r denne h�ndelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _h�ndelse"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle h�ndelser"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilotv�rkt�jerne ser ikke ud til at v�re installeret p� dette system."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl under k�rsel af %s."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Fuldf�rt "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5265,329 +5337,335 @@ msgstr ""
 "<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Geografisk lokation:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "V�lg en handling"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort m�deoplysning."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "M�deinformation"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "M�deforslag"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "M�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Anmodning om m�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "M�desvar"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "M�deaflysing"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�debesked"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, 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:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Svar p� opgave"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Foresp�rgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Svar p� ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Kunne ikke �bne mappen i `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "V�lg mappe"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "V�lg mappe"
@@ -5633,7 +5711,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Form�nd"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
@@ -5647,52 +5725,52 @@ msgid "Resources"
 msgstr "Ressourse"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Individuel"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Ressourse"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Rum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Formand"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Foresl�et"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Delegeret"
 
@@ -5782,43 +5860,50 @@ msgstr "Tid for m�dets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�bner lager %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indl�se opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, 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:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Fejl under start af %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fuldf�rt dato"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
@@ -5832,7 +5917,13 @@ msgstr "Kunne ikke �bne mappen i `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Den n�dvendige metode til �bning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarmer %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5840,7 +5931,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5848,12 +5939,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�bner mappe %s"
@@ -5914,49 +6005,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Mindst en deltager er n�dvendig"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Mindst en deltager er n�dvendig"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "L�s listen igen"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Ledig/optaget-information (%s til %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar-information"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i arrangementet"
 
@@ -6192,7 +6292,7 @@ msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
@@ -6216,7 +6316,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6229,12 +6329,12 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Sp�rg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Udskriv kort"
@@ -6308,17 +6408,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Kunne ikke koble til lager: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "P�mindelse"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenderbesked"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6327,85 +6427,85 @@ msgstr ""
 "Evolution har fundet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "tid-nu forventer 0 argumenter"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time forventer 1 argument"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 til make-time skal v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day forventer 2 argumenter"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day forventer at argument 2 er et heltal"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 1 argument"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 1 argument"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range forventer at argument 2 er af type time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6413,11 +6513,11 @@ msgstr ""
 "contains? forventer at argument 1 er en af \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer mindst 1 argument"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6425,22 +6525,27 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller �t, og kun "
 "�t, argument er den boolske v�rdi falsk (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 1 argument"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering af s�geudtrykket gav ikke en boolsk v�rdi"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Anden fejl"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8037,82 +8142,82 @@ msgstr "Gemmer mappe '%s'"
 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:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under l�sning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under k�rsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke �bne spool-mappen"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes p� besked %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udf�relse af filters�gning: %s: %s"
@@ -8159,11 +8264,11 @@ msgstr "Uunderst�ttet operation: s�g efter udtryk: efter %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderst�ttet operation: s�g efter uid'er: efter %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Flytter beskeder"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopierer beskeder til %s"
@@ -8487,7 +8592,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
@@ -8545,52 +8650,52 @@ msgstr "POP f�r SMTP-godkendelse via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Overs�ttelse af regul�rt udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et v�rtsnavn"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
@@ -8789,7 +8894,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8798,11 +8903,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8824,7 +8929,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8879,68 +8984,76 @@ msgstr "Kan ikke �ndre navn p� mappe: %s: Ugyldig operation"
 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:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Svar fra server blev afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev �delagt og genskabt p� serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "S�ger efter �ndrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kunne ikke afkode besked."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8956,28 +9069,24 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ingen s�dan besked"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilg�ngelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "S�ger efter nye beskeder"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -8994,6 +9103,11 @@ msgstr "Kan ikke �bne cache-katalog: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Fejl under mellemlagring af besked %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Ser efter nye beskeder"
@@ -9042,77 +9156,72 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operationen er ikke underst�ttet"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Godkendelse mislykkedes."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Mappen er ikke tom"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen underst�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9123,24 +9232,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenavn kan ikke indeholde linjeskift."
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
@@ -9217,8 +9326,8 @@ msgstr ""
 "For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
@@ -9230,7 +9339,7 @@ msgstr "Lagerrod %s er ikke et normalt katalog"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
@@ -9244,32 +9353,32 @@ 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:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke �ndre navn p� mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke gemme sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilf�je besked i sammendraget: ukendt grund"
 
@@ -9289,6 +9398,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9300,12 +9410,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
 #, 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:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9331,7 +9443,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:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ge i mappe `%s': %s"
@@ -9361,7 +9474,7 @@ msgid "Storing folder"
 msgstr "Gemmer mappe"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappel�s p�: %s: %s"
@@ -9530,40 +9643,45 @@ 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:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' er ikke en normal fil."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke blive slettet"
 
@@ -9659,50 +9777,50 @@ msgstr "Afbryd"
 msgid "Operation failed: %s"
 msgstr "Operation afbrudt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ukendt nedb�r"
@@ -9975,45 +10093,45 @@ msgstr "Midlertidig autenticeringsfejl"
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Beskeden ser ikke ud til at v�re rigtig udformet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10024,90 +10142,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: 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:663
+#: 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:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fejl ved \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
@@ -10115,80 +10233,71 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Ugyldigt svar p� autenticering fra server."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opf�ringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Tilf�j bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Vedl�g en fil til beskeden"
 
@@ -10220,7 +10329,7 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Klik her for at f� adressebogen op"
 
@@ -10231,45 +10340,45 @@ msgstr "Klik her for at f� adressebogen op"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10280,12 +10389,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Inegn beskrivelse"
@@ -10300,7 +10409,7 @@ msgstr "Vedl�g en fil"
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke oprette PGP signaturkontekst."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10309,34 +10418,34 @@ msgstr ""
 "Fejl under l�sning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indl�sning af fil: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10345,7 +10454,7 @@ msgstr ""
 "Kunne ikke s�ge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10354,7 +10463,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10363,7 +10472,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10371,28 +10480,39 @@ 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:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Denne besked er ikke sendt.\n"
+"\n"
+"Vil du gemme �ndringene?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Advarsel: �ndret besked"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Gem signatur"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10400,7 +10520,18 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udv�lgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Kunne ikke oprette vindue:\n"
+"En komponent i HTML tekstbehandler kunne ikke aktiveres."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10408,13 +10539,13 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10422,8 +10553,9 @@ msgstr ""
 "Kunne ikke oprette skrivevindue fordi du ikke har sat\n"
 "en identitet op i e-post-komponenten."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
 #: data/evolution.desktop.in.h:1
@@ -10474,8 +10606,8 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10624,7 +10756,8 @@ msgid "years"
 msgstr "�r"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Du har glemt at v�lge en dato."
 
 #: filter/filter-datespec.c:269
@@ -10680,15 +10813,12 @@ msgid "Add action"
 msgstr "Tilf�j handling"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Du glemte at v�lge en mappe.\n"
-"Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Stilnavn:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -10701,7 +10831,7 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Vigtig"
@@ -10890,228 +11020,232 @@ msgid "Beep"
 msgstr "Belem"
 
 #: 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:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Slettet"
 
-#: 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
-#, fuzzy
-msgid "does not return"
-msgstr "eksisterer 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
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Skitse"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "var efter"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "var f�r"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "M�rket"
-
-#: 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
-#, fuzzy
-msgid "is not Flagged"
-msgstr "M�rket"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Send besked til kontakt"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Afspil lyd:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "L�s"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Tr�ffer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "er st�rre end"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "er mindre end"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "S�t status"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "S�t status"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "indeholder ikke"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "M�rket"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "var efter"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "var f�r"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "er st�rre end"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "M�rket"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "er st�rre end"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "starter med"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regler"
@@ -11145,31 +11279,31 @@ msgstr "Du skal specificere mindst en mappe som kilde."
 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:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Venligst vent"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "S�ger i %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Post"
 
@@ -11230,39 +11364,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 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:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Affald"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokal e-post-fil %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ger i katalog"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediger filtre"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11380,26 +11514,36 @@ msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Offentlig"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mappe som indeholder e-post"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "�ndr denne mappes egenskaber"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11407,78 +11551,79 @@ 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:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Advarsel: �ndret besked"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Skriv en besked"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Ny besked"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Forrige besked"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kobler til server..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
@@ -11523,140 +11668,140 @@ msgstr "%d sendte"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra besked"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe p� e-post_liste"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Fuldf�rt"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Fortryd sletning"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuel mappe p� e-postliste"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe p� e-postliste (%s)"
@@ -11730,20 +11875,20 @@ msgstr "Du har ikke udfyldt al n�dvendig information."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_V�rt:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ugernavn:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -11760,14 +11905,14 @@ msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -11856,9 +12001,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "Du sender en besked i HTML-format, men f�lgende modtageres �nsker ikke at "
 "modtage beskeder i HTML-format:\n"
@@ -11901,7 +12047,7 @@ msgstr ""
 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:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11909,28 +12055,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:1206
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopi�r beskeder til"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, 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:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11938,7 +12084,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11946,39 +12092,39 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, 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:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis n�ste ul�ste besked"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11990,7 +12136,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11999,64 +12145,64 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Inegn beskrivelse"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt uden navn:"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Sendt"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Tilf�j kriterie"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gem signatur"
@@ -12118,16 +12264,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
@@ -12845,78 +12991,74 @@ 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:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Vis indlejret"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "�bn i %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis indlejret (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Indl�s b_illeder"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Overskredne opga_ver:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %H:%M"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "�bn henvisning i netl�ser"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopi�r henvisning"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
@@ -12925,109 +13067,110 @@ msgstr "Gem billede som..."
 msgid "Pinging %s"
 msgstr "S�ger i %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "E-postprogram: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 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:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke oprette PGP verificeringskontekst."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, 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:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13036,27 +13179,22 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe p�: %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1326
+#: 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:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s kan m�ske ikke konfigureres igen fordi det ikke er en lokal mappe"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13064,15 +13202,15 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Du kan ikke �ndre format p� en ikke-lokal mappe."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigur�r /%s igen"
 
+#: mail/mail-local.c:1510
+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:257
 #, c-format
 msgid ""
@@ -13313,21 +13451,21 @@ msgstr "Venter..."
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk denne adgangskode for resten af denne session"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
@@ -13336,11 +13474,11 @@ msgstr "Indtast adgangskode"
 msgid "Could not save signature file: %s"
 msgstr "Kunne ikke gemme signaturfil."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Gem signatur"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13350,11 +13488,12 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML-signatur:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Navn:"
 
@@ -13394,7 +13533,7 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
@@ -13424,67 +13563,67 @@ msgstr "(Uden emne)"
 msgid "%s - Message"
 msgstr "%s - Besked"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -13559,45 +13698,71 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "Forh�ndsvis"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Fuldf�rt"
+
+#: 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 "T�m"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "F�rdig "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Filnavn:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S�ger i mapper under %s p� \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S�ger i mapper p� rod-niveau p� \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gem i mappe..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Venligst v�lg en server."
 
@@ -23506,12 +23671,12 @@ msgstr "%l: %M %d %B"
 msgid "No description"
 msgstr "Inegn beskrivelse"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -23521,23 +23686,23 @@ msgstr "Lokale mapper"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Tilf�j nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
 
@@ -23577,11 +23742,11 @@ msgstr "(Ingen beskrivelse)"
 msgid "My Weather"
 msgstr "Min vejrbesked"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Vejr"
 
@@ -24909,6 +25074,11 @@ msgstr ""
 "Kan ikke overf�re mappe:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "�bn i %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25153,12 +25323,25 @@ msgid "Rename folder"
 msgstr "�ndr navn p� mappe"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Kunne ikke �ndre navn p� mappe:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25167,12 +25350,12 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Opret _ny mappe..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Ny..."
 
@@ -25202,20 +25385,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst v�lg information du �nsker at importere:"
 
-#. 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 ""
-"Importerer %s\n"
-"Importerer ikke klar.\n"
-"Venter 5 sekunder f�r nyt fors�g."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25224,22 +25394,22 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25248,11 +25418,11 @@ msgstr ""
 "Ingen importerer som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25261,17 +25431,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25280,31 +25450,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "V�lg en fil"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25312,24 +25482,24 @@ msgstr ""
 "Venligst vent...\n"
 "S�ger efter eksisterende ops�tning"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "V�lg en m�lmappe til at importere data"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
@@ -25357,32 +25527,32 @@ msgstr "Synkroniserer mappe"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�bner mappe %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�bner mappe %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "�bn i %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25424,44 +25594,44 @@ msgstr "Et mappenavn kan ikke indeholde et skr�streg (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy blev ikke fundet i din $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke k�res."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "V�lg mappen du �nsker at �bne"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Opret en ny genvej"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 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:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
@@ -25469,26 +25639,26 @@ msgstr "Arbejd frakoblet"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 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:1894
+#: shell/e-shell-view.c:1903
 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:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25506,12 +25676,12 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25522,19 +25692,19 @@ msgstr ""
 "er afsluttet uventet. Du m� afslutte Evolution og genstarte\n"
 "for at f� adgang til disse data igen."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -25674,58 +25844,62 @@ msgstr "Genveje"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Specificeret mappe blev ikke fundet"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funktionen er ikke implementeret i dette lager"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Specificeret type er ikke underst�ttet for dette lager"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Specificeret mappe kan ikke �ndres eller fjernes"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 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:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Kan ikke oprette en mappe med det navn"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25941,9 +26115,10 @@ msgstr ""
 "Venligst klik 'N�ste' for at forts�tte. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -25961,26 +26136,22 @@ msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Importeringsassistent for Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Import�r fil (trin 3 af 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Import�r type (trin 1 af 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "V�lg importerere (trin 2 af 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "V�lg en fil (trin 2 af 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"
@@ -26197,10 +26368,10 @@ msgstr "tiden nu"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -26319,7 +26490,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Gem"
 
@@ -26346,7 +26517,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fil"
 
@@ -26428,7 +26599,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Ops�t m�de for denne opf�ring"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Tilpas min Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26478,29 +26650,30 @@ msgid "Post a message to a Public folder"
 msgstr "Gemmer besked til mappe"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Abonn�r p� mapper..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Vis vindue for forh�ndsvisning af besked"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonn�r eller fjern abonnement p� mapper p� eksterne servere"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Forh�ndsvisningsvindue"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Abonn�r p� mapper..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "�ndr egenskaber for denne mappe"
@@ -26594,7 +26767,7 @@ msgstr "Beskedsliste med tr�de"
 msgid "_Expunge"
 msgstr "_Fjern slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -26911,7 +27084,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "S�g efter tekst i kroppen af vist besked"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Redig�r sideindstillinger for aktiv skriver"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27025,7 +27199,7 @@ msgstr "Citeret"
 msgid "_Resend..."
 msgstr "_Omd�b..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_V�rkt�jer"
 
@@ -27040,12 +27214,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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "L_uk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Vis"
 
@@ -27219,7 +27393,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Gem opf�ringen og luk dialogboksen"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -27388,7 +27562,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Opret _ny mappe..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -27405,114 +27579,134 @@ msgid "Pi_lot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Indstillinger for _h�hdholdt..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Opret _ny mappe..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�lagt e-post og hent ny e-post"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "E-post-konfiguration"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "E-post-konfiguration"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Skift"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� visning af mappelinjen fra/til"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� visning af genvejslinjen fra/til"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopi�r..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "M_appe"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Import�r..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Flyt..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "I_ngen genindtr�ffelse"
+msgid "_Remove Other User's Folder"
+msgstr "Opret _ny mappe..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Omd�b..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Indstillinger for e-post..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Genvej"
@@ -27755,11 +27949,11 @@ msgstr "Tegnkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Redigering af s�gning"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Gem s�gning"
 
@@ -27839,6 +28033,54 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " Fje_rn"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Tilf�j"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "S�ger efter nye beskeder"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Mappen er ikke tom"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u byte"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Du glemte at v�lge en mappe.\n"
+#~ "Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s kan m�ske ikke konfigureres igen fordi det ikke er en lokal mappe"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importerer %s\n"
+#~ "Importerer ikke klar.\n"
+#~ "Venter 5 sekunder f�r nyt fors�g."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Importeringsassistent for Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "I_ngen genindtr�ffelse"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Fejl i s�geudtryk."
 
@@ -27883,15 +28125,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "Ikke-deltagere"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Denne besked er ikke sendt.\n"
-#~ "\n"
-#~ "Vil du gemme �ndringene?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (forvalgt)"
@@ -28196,14 +28429,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "Slet alt undtaget signatur"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML-signatur:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Filnavn:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML-signatur:"
 
@@ -28234,14 +28459,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Tilf�j"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr " Fje_rn"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Er du sikker p� at du vil fjerne mappen \"%s\"?"
 
@@ -28580,12 +28797,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Kunne ikke finde nogen af dine identiteter i deltagerlisten!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Ledig/optaget-information (%s til %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar-information"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Ugyldig type i krop-indeholder, forventer streng"
 
@@ -28832,9 +29043,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Opgave..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "Indstillinger for e-post..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Videresend vedl_agt"
 
diff --git a/po/de.po b/po/de.po
index 3d9a146ce7..323cb01177 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1cvs\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-05-22 21:30GMT\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -324,11 +324,17 @@ msgstr "Familienname"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Namenlose Kontaktliste"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard f�r %s"
@@ -339,47 +345,47 @@ msgstr "VCard f�r %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Suchen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Laden..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Verbindung zu LDAP-Server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzuf�gen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server �ndern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Fehler beim Ausf�hren der Suche"
 
@@ -396,13 +402,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
@@ -473,10 +479,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik f�r die beispielhafte Adressbuch-Kontrolle"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakte"
@@ -493,28 +499,38 @@ msgstr "LDAP-Server:"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Neuen Kontaktliste anlegen"
@@ -552,7 +568,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
@@ -560,11 +576,11 @@ msgstr "gnome-vfs konnte nicht initialisiert werden"
 msgid "Other Contacts"
 msgstr "Andere Kontakte"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht ge�ffnet werden"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -572,7 +588,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht ge�ffnet werden. Bitte pr�fen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen d�rfen."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -583,7 +599,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ung�ltigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 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,7 +612,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -607,37 +623,47 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ung�ltigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Passwort f�r %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Irgend ein Feld enth�lt"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -645,7 +671,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -653,25 +679,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -737,51 +763,51 @@ msgid "  S_how Supported Bases "
 msgstr "  Unterst�tzte Basen _anzeigen"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "<< Weniger Optionen"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "<- _Entfernen"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr "666"
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Entfernen"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "<< Weniger Optionen"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr "Attributzuordnungen hinzuf�gen (oder bearbeiten)"
@@ -921,41 +947,50 @@ msgid "One"
 msgstr "One"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
+#, fuzzy
 msgid ""
-"Please select and Evolution attribute and an\n"
+"Please select an Evolution attribute and an\n"
 "LDAP attribute to associate with it."
 msgstr ""
 "Bitte w�hlen sie ein Evolution-Attribut und ein\n"
 "LDAP-Attribut mit dem es assoziiert werden soll."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+"Bitte w�hlen sie ein Evolution-Attribut und ein\n"
+"LDAP-Attribut mit dem es assoziiert werden soll."
+
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "R_estore Defaults"
 msgstr "Standard wiederh_erstellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr "Standard wiederher_stellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Suchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Select"
 msgstr "Ausw�hlen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Selected:"
 msgstr "Ausgew�hlt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -965,7 +1000,7 @@ msgstr ""
 "Ihrem LDAP-Server\n"
 "herstellt, wenn dieser SSL oder TLS unterst�tzt."
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -983,7 +1018,7 @@ msgstr ""
 "Verbindung bereits\n"
 "sicher ist."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -997,7 +1032,7 @@ msgstr ""
 "Sie anf�llig\n"
 "f�r Sicherheitsl�cken sind. "
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1007,7 +1042,7 @@ msgstr ""
 "LDAP\n"
 "Suchen und f�r das Erstellen und Bearbeiten von Kontakten ver�ndern. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1015,31 +1050,31 @@ msgstr ""
 "Der letzte Schritt, der zur Konfiguration eines LDAP-Server notwendig ist, "
 "ist das Angeben eines Namens, der zur Anzeige verwendet wird."
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Step 1: Server Information"
 msgstr "Schritt 1: Server Informationen"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
 msgstr "SChritt 2: Verbindung zum Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr "Schritt 3: Das Verzeichnis durchsuchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr "Schritt 4: Name"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr "Unterst�tzte Such-Basen"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1052,7 +1087,7 @@ msgstr ""
 "wenn\n"
 "Sie unsicher bei diesen Einstellungen sind."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1064,7 +1099,7 @@ msgstr ""
 "aufgenommen werden sollen und wie lange eine Suche dauern darf. Fragen\n"
 "Sie Ihren System-Administrator, ob Sie diese Einstellungen �ndern m�ssen."
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1077,7 +1112,7 @@ msgstr ""
 "Verzeichnis-\n"
 "baums beginnen."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1093,7 +1128,7 @@ msgstr ""
 "unterhalb Ihres\n"
 "Suchbereichs einschliessen."
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1111,7 +1146,7 @@ msgstr ""
 "Administrator, wenn Sie Hilfe ben�tigen, um diese Informationen zu\n"
 "bekommen."
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1119,7 +1154,7 @@ msgstr ""
 "Dies ist der vollst�ndige Name des LDAP-Servers. Zum Beispiel: \"ldap."
 "meinefirma.de\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1128,7 +1163,7 @@ msgstr ""
 "Dies ist die maximale Anzahl Eintr�gen, die herunter geladen werden. Wenn "
 "diese Zahl zu hoch gesetzt wird, wird das Adressbuch verlangsamt."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1138,7 +1173,7 @@ msgstr ""
 "Beachten Sie, dass ein anonymer Zugang zum LDAP-Server ben�tigt wird, wenn "
 "Sie dies auf \"E-Mail-Adresse\" einstellen."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1148,7 +1183,7 @@ msgstr ""
 "angezeigt wird.\n"
 "Er ist nur f�r Anzeigezwecke. "
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1160,11 +1195,11 @@ msgstr ""
 "Eine Liste mit Standard-Ports wurde bereits angegeben. Fragen Sie\n"
 "Ihren System-Administrator, welchen Port Sie angeben m�ssen."
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr "Diese Option stellt ein wie lange eine Suche ausgef�hrt wird."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1180,24 +1215,24 @@ msgstr ""
 "hinzuf�gen,\n"
 "werden. "
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TSL verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (DN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr "Immer, wenn m�glich"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1205,44 +1240,44 @@ msgstr "Immer, wenn m�glich"
 msgid "_Add"
 msgstr "Hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
-msgstr "_Hinzuf�gen ->"
+msgid "_Add ->"
+msgstr "_Hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add to DN"
 msgstr "Zum DN _hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr "_Immer"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Display name:"
 msgstr "_Name, der angezeigt wird:"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr "_Eindeutiger Name (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr "SSL/TLS _nicht verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1252,92 +1287,92 @@ msgstr "_Downloadbegrenzung:"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Evolution attribute:"
 msgstr "_Evolution-Attribut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr "_Wenn n�tig "
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr "_LDAP-Attribut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr "_LDAP-Attribute:"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr "Methode zur _Anmeldung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "Mehr Optionen >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr "Standard wiederherstellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr "_Zeit�berschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr "Zugangs-Druide"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr "Zugang-Editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr "dn-customization-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr "edit_server_window_simple"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr "mappings-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr "objectclasses-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -1351,8 +1386,8 @@ msgstr "Fabrik f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1383,11 +1418,11 @@ msgstr "(%d nicht gezeigt)"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch w�hlen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 msgid "Find contact in"
 msgstr "Kontakt finden in"
 
@@ -1460,7 +1495,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Details"
 
@@ -1519,13 +1554,13 @@ msgstr "Will HTML-Mail erhalten"
 
 #: 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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "L�schen"
 
@@ -1553,1025 +1588,1025 @@ msgstr "_�ffentlicher Kalender-URI:"
 msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algerien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armenien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "�sterreich"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Belarussland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien und Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: 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:169
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Cayman-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tschad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Weihnachtsinsel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos-(Keeling-)Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komoren"
 
-#: 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
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeink�ste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: 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:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "D�nemark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Osttimor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "�gypten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "�quatorial-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "�thiopien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falkland-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "F�r�er-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finnland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Frankreich"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Franz�sisch-Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Franz�sisch-Polynesian"
 
 # CHECK - Source: Database of program "Ding"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Franz�sische S�dpolar-Territorien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Deutschland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Griechenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Gr�nland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Heard- und McDonald-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Heiliger Stuhl"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Indien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "Republik Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Lettland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: 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:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Malediven"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr "Moldawien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Niederl�ndische Antillen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "N�rdliche Marianen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norwegen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Pal�stinensisches Autonomiegebiet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rum�nien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Russische F�deration"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "St. Licia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Solomon-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "S�dafrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "S�dgeorgien und die S�dlichen Sandwichinseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre und Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard- und Jan-Mayen-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Swasiland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Schweden"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "Vereinigte Republik Tansania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad und Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "T�rkei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Turks und Caicos-Inseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuval"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Vereinigtes K�nigreich"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "Britische Jungferninseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "U.S.-Jungferninseln"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis und Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslawien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
@@ -2608,20 +2643,20 @@ msgstr "TTY/TTD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget f�r ein Feld konnte nicht gefunden werden: '%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzuf�gen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -2643,6 +2678,19 @@ msgstr ""
 "%s gibt es bereits\n"
 "M�chten Sie sie �berschreiben?"
 
+#: 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Datei �berschreiben?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
@@ -2775,7 +2823,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2826,7 +2874,7 @@ msgstr ""
 "trotzdem hinzuf�gen?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
@@ -2835,24 +2883,24 @@ msgstr "Komplexe Suche"
 msgid "Search"
 msgstr "Suchen"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 Karte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Fehler beim Empfangen der Buchansicht"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2864,10 +2912,10 @@ msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2875,7 +2923,7 @@ msgstr "Unbekannter Fehler"
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
@@ -2896,8 +2944,8 @@ msgstr "Protokoll nicht unterst�tzt"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Storniert"
 
@@ -2948,7 +2996,7 @@ msgstr "Fehler beim Entfernen einer Liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
@@ -2961,11 +3009,10 @@ msgid "Display Cards"
 msgstr "Karten anzeigen"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:213
-#, c-format
+#, 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 ""
 "Sie haben %d Karten angefordert. Dies wird %d neue Fenster auf ihrem "
 "Bildschirm �ffnen. Wollen Sie wirklich alle Karten anzeigen lassen?"
@@ -3053,7 +3100,7 @@ msgstr "Adressbuch"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -3130,7 +3177,7 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einf�gen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3138,8 +3185,8 @@ msgstr "Einf�gen"
 msgid "Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3147,7 +3194,7 @@ msgstr "Aktuelle Ansicht"
 #. 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3155,11 +3202,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3291,7 +3338,7 @@ msgid "Include:"
 msgstr "Dazunehmen:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Querformat"
 
@@ -3316,7 +3363,7 @@ msgid "Options"
 msgstr "Optionen"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Ausrichtung"
 
@@ -3339,7 +3386,7 @@ msgstr "Papierquelle:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Hochformat"
 
@@ -3401,20 +3448,20 @@ msgstr "Unbenannter Termin"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Niedrig"
 
@@ -3425,13 +3472,17 @@ msgstr "Niedrig"
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -3538,11 +3589,11 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Keine Beschreibung verf�gbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3555,13 +3606,13 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3578,15 +3629,15 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausf�hren wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "Mich �ber dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik f�r Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
@@ -3635,7 +3686,7 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3714,9 +3765,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3733,13 +3784,13 @@ msgid "Assigned"
 msgstr "Zugewiesen"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nein"
 
@@ -3759,75 +3810,95 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_�ffentlicher Kalender-URI:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Ordner mit Terminen und Ereignissen"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Aufgaben drucken"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Ordner mit To-Do-Eintr�gen"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "Neuer Ganztags-Termin"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Ganz_tags-Termin"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen Termin anlegen"
@@ -3870,30 +3941,31 @@ msgid "Alarm Repeat"
 msgstr "Alarmwiederholung"
 
 #: 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 ""
+"Dies ist eine E-Mail-Erinnerung, aber Evolution unterst�tzt diese Art von "
+"Erinnerung noch nicht. Sie werden die Optionen f�r diese Erinnerung nicht "
+"bearbeiten k�nnen."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Anzuzeigende Nachricht"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Klang abspielen:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Den Alarm wiederholen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Programm ausf�hren:"
 
-#: 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 ""
-"Dies ist eine E-Mail-Erinnerung, aber Evolution unterst�tzt diese Art von "
-"Erinnerung noch nicht. Sie werden die Optionen f�r diese Erinnerung nicht "
-"bearbeiten k�nnen."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Mit diesen Argumenten:"
@@ -3917,110 +3989,110 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausf�hren"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuf�hrende Aktion"
 
-#: 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 vor Terminbeginn"
 
-#: 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 nach Terminbeginn"
 
-#: 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 zum Terminbeginn"
 
-#: 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 vor Terminende"
 
-#: 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 nach Terminende"
 
-#: 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 zum Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: 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 f�r einen unbekannten Ausl�sertyp."
@@ -4041,7 +4113,7 @@ msgstr "Erinnerungen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -4123,7 +4195,7 @@ msgid "Days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4136,7 +4208,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Montag"
 
@@ -4146,7 +4218,7 @@ msgid "S_un"
 msgstr "S_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4160,7 +4232,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern in Datumsnavigator zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4177,7 +4249,7 @@ msgid "Task List"
 msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4194,7 +4266,7 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4203,7 +4275,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -4429,8 +4501,8 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Speichern unter..."
 
@@ -4500,27 +4572,27 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -4589,19 +4661,19 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Ein Organisator wird ben�tigt."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Mindestens ein Teilnehmer wird ben�tigt."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -4641,7 +4713,7 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -4653,7 +4725,7 @@ msgstr "Position"
 
 #: 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4731,43 +4803,43 @@ msgstr ""
 "Dieser Termin enth�lt Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "erster"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "zweiter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "dritter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr "vierter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr "letzter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "Other Date"
 msgstr "Anderes Datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -4863,7 +4935,7 @@ msgstr "Abgeschlossen am:"
 
 #: 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Erfordert Ma�nahme"
 
@@ -4872,7 +4944,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4884,17 +4956,17 @@ msgstr "_Priorit�t:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4964,12 +5036,12 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Ausgew�hlte Objekte werden gel�scht"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�_ffnen"
@@ -4978,30 +5050,30 @@ msgstr "�_ffnen"
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:995 calendar/gui/e-day-view.c:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5027,12 +5099,12 @@ msgstr "Ausgew�hlte Aufgaben als abgeschlossen _markieren"
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
@@ -5041,8 +5113,8 @@ msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5071,7 +5143,7 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Zusammenfassung"
@@ -5138,120 +5210,120 @@ msgstr "AM"
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr "_Konfigurieren..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr "Pilot _konfigurieren..."
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausf�hren von %s."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Endet: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>�berf�llig:</b>&nbsp;"
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "iKalender-Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iKalender-Fehler"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5259,326 +5331,332 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "w�hlen Sie dann eine Aktion aus dem Men� unten aus."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Ge_ographischer Ort: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "Vorl�ufig angenommen"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Eine Aktion w�hlen:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Vorl�ufig annehmen"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen senden"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Neueste Informationen senden"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverst�ndliche Nachricht gesendet."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Verf�gbarkeits-Anfrage"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeits-Anfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Verf�gbarkeits-Antwort"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verf�gbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enth�lt ausschlie�lich nicht unterst�tzte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 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:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 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:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 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:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Sie haben keine Berechtigung den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 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:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Sie haben keine Berechtigung den Kalender zu aktualisieren\n"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 msgid "Select Calendar Folder"
 msgstr "Ordner f�r Kalender w�hlen"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr "Ordner f�r Aufgaben w�hlen"
 
@@ -5623,7 +5701,7 @@ msgstr "datum-anfang"
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Ben�tigte Teilnehmer"
 
@@ -5637,52 +5715,52 @@ msgid "Resources"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Raum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "Ben�tigter Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Vorl�ufig"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Delegiert"
 
@@ -5772,41 +5850,48 @@ msgstr "Anfang der Besprechung:"
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden ge�ffnet"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' ben�tigt wird, ist nicht unterst�tzt"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in `%s' zu �ffnen"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Fehler beim Starten von %s"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr "Ausgew�hlte Objekte werden gel�scht..."
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Wird ges�ubert"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
@@ -5821,7 +5906,13 @@ msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum �ffnen von `%s' ben�tigt wird, wird nicht unterst�tzt"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarm am %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5829,7 +5920,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5837,12 +5928,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ordner %s �ffnen"
@@ -5903,48 +5994,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Mindestens ein Teilnehmer wird ben�tigt"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Mindestens ein Teilnehmer wird ben�tigt"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Verf�gbarkeitsinformationen"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "iKalender-Information"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
@@ -6180,7 +6281,7 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Druckvorschau"
@@ -6204,7 +6305,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6217,12 +6318,12 @@ msgstr ""
 "\n"
 "Aufgaben wirklich entfernen?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -6292,15 +6393,15 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6308,85 +6409,85 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
 "Argument"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day erwartet zwei Argumente"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin erwartet 1 Argument"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end erwartet 1 Argument"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6394,11 +6495,11 @@ msgstr ""
 "contains? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
 "\"description\""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6406,22 +6507,27 @@ msgstr ""
 "has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
 "Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? erwartet 1 Argument"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Anderer Fehler"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8015,81 +8121,81 @@ msgstr "Ordner '%s' wird gespeichert"
 msgid "You must be working online to complete this operation"
 msgstr "Sie m�ssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht empfangen werden"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ung�ltige Argumente"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ung�ltige Argumente"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "\"Pipe\" zu '%s'  konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess '%s' konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
@@ -8136,11 +8242,11 @@ msgstr "Nicht unterst�tzte Operation: Suche nach Ausdruck: f�r %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterst�tzte Operation: nach UIDs suchen: f�r %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
@@ -8467,7 +8573,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -8524,50 +8630,50 @@ msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regul�ren Ausdrucks: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ben�tigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgel�st"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Aufl�sen eines Namens: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Adresse wird aufgel�st"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: Rechner nicht gefunden"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: unbekannter Grund"
 
@@ -8768,7 +8874,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8781,11 +8887,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -8807,7 +8913,7 @@ msgstr ""
 "M�chten Sie trotzdem akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8861,68 +8967,76 @@ msgstr "Ordner konnte nicht umbenannt werden: %s: Ung�ltige Aktion"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Unerwartete Antwort von IMAP-Server: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu fr�h."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung f�r %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerst�rt und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nachricht konnte nicht empfangen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8938,28 +9052,24 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Suchen nach neuen Nachrichten"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -8976,6 +9086,11 @@ msgstr "Cache-Verzeichnis konnte nicht ge�ffnet werden: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nachricht %s konnte nicht gecacht werden: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Nach neuer Mail sehen"
@@ -9024,74 +9139,69 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschl�sselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s-Dienst f�r %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterst�tzt."
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL \"Verhandlungen\" fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Der Ordner ist nicht leer"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort f�r %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9102,24 +9212,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -9195,8 +9305,8 @@ msgid ""
 msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
@@ -9208,7 +9318,7 @@ msgstr "Speicherwurzel `%s' ist kein regul�res Verzeichnis."
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner kann nicht abgerufen werden: %s: %s"
@@ -9222,32 +9332,32 @@ msgstr "Lokale Speicher haben keinen Posteingangsordner"
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugef�gt werden: Grund unbekannt"
@@ -9268,6 +9378,7 @@ msgstr "Ung�ltiger Inhalt der Nachricht"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9279,12 +9390,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
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9310,7 +9423,8 @@ msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
@@ -9338,7 +9452,7 @@ msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
@@ -9508,40 +9622,45 @@ msgstr "`%s' ist kein Verzeichnis."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Speicherwurzel `%s' ist kein regul�res Verzeichnis."
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ist keine regul�re Datei."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr "Speicher unterst�tz keinen Eingang"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner k�nnen nicht gel�scht werden"
 
@@ -9635,47 +9754,47 @@ msgstr "Abbrechen benutzen"
 msgid "Operation failed: %s"
 msgstr "Operation fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr "Benutzer hat abgebrochen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP-Zusammenfassung kann nicht empfangen werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Gel�schte Nachrichten werden ausger�umt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nachricht %s kann nicht erhalten werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -9945,42 +10064,42 @@ msgstr "Zeitweiliger Legitimationsfehlschlag"
 msgid "Authentication required"
 msgstr "Legitimation ben�tigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr "Server scheint kein SSL zu unterst�tzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zeit�berschreitung bei STARTTLS-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "STARTTLS-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort f�r %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9991,91 +10110,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: 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:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung �ber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht g�ltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: ein oder mehrere ung�ltige "
 "Empf�nger"
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP-Begr��ung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Ung�ltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "MAIL-FROM-Antwortfehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
@@ -10083,78 +10202,69 @@ msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 #. 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "DATA-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeit�berschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "DATA-Terminierungsantwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "RSET-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "QUIT-Antwort-Fehler"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 Byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u Bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Das gew�hlte Element aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Anlage hinzuf�gen..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -10186,7 +10296,7 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "F�r das Adressbuch hier klicken"
 
@@ -10197,45 +10307,45 @@ msgstr "F�r das Adressbuch hier klicken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10246,12 +10356,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_Port:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Beschreibung"
@@ -10266,7 +10376,7 @@ msgstr "Eine Datei beilegen"
 msgid "Could not create a PGP signature context"
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10275,34 +10385,34 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, �berschreiben?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10311,7 +10421,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10320,7 +10430,7 @@ msgstr ""
 "Datei konnte nicht verk�rzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10329,7 +10439,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10338,28 +10448,39 @@ msgstr ""
 "entdeckt.\n"
 "M�chten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Diese Nachricht wurde nicht versandt.\n"
+"\n"
+"Wollen Sie Ihre �nderungen speichern?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Datei �ffnen"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur speichern"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10367,7 +10488,18 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adressw�hler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Es konnte kein Erstellungsfenster angelegt werden:\n"
+"HTML-Editorkomponente konnte nicht aktiviert werden."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10375,7 +10507,7 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 #, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
@@ -10384,7 +10516,7 @@ msgstr ""
 "<b>(Der Composer enth�lt einen nicht-Text Nachrichtenrumpf, der nicht "
 "bearbeitet werden kann.)<b>"
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10393,8 +10525,9 @@ msgstr ""
 "in der Mailkomponente noch keine Identit�t konfiguriert\n"
 "haben."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
 #: data/evolution.desktop.in.h:1
@@ -10445,8 +10578,8 @@ msgstr "Betreff enth�lt"
 msgid "Subject does not contain"
 msgstr "Betreff enth�lt nicht"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10594,7 +10727,8 @@ msgid "years"
 msgstr "Jahre"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Sie haben vergessen, ein Datum zu w�hlen."
 
 #: filter/filter-datespec.c:269
@@ -10650,16 +10784,12 @@ msgid "Add action"
 msgstr "Aktion hinzuf�gen"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Sie haben vergessen, einen Ordner zu w�hlen.\n"
-"Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern "
-"der Mail."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "_Dateiname angeben:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
@@ -10672,7 +10802,7 @@ msgstr ""
 "Fehler im regul�ren Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Wichtig"
@@ -10856,222 +10986,226 @@ msgid "Beep"
 msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "enth�lt"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "enth�lt nicht"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "endet nicht mit"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "klingt nicht wie"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "beginnt nicht mit"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "endet mit"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "ist nach"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "ist vor"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "ist markiert"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "ist gr��er als"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ist nicht"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ist nicht markiert"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr "Etikett"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Shell-Befehl ausf�hren"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Empf�nger"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Gesch�ft"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "ist gr��er als"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "ist kleiner als"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shell-Befehl ausf�hren"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Gr��e (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "klingt wie"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Status setzen:"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "enth�lt"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "enth�lt nicht"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "endet nicht mit"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "klingt nicht wie"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "beginnt nicht mit"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "endet mit"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existiert"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "ist markiert"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "ist nach"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "ist vor"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "ist gr��er als"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "ist nicht markiert"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "ist nicht"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "ist"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "ist gr��er als"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Gesch�ft"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "beginnt mit"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regeln"
@@ -11105,31 +11239,31 @@ msgstr "Sie m�ssen mindestens einen Ordner als Quelle angeben."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importieren..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Mail"
 
@@ -11195,37 +11329,37 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "M�ll"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 msgid "Scanning mail filters"
 msgstr "Mailfilter werden durchsucht"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr "Mail-Filter"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11337,26 +11471,36 @@ msgid "Folder containing mail"
 msgstr "Mail enthaltender Ordner"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "�ffentlich"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mail enthaltender Ordner"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Virtueller M�ll"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Virtueller M�llordner"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11364,79 +11508,80 @@ msgstr ""
 "Einige Ihrer Mail-Einstellungen scheinen ung�ltig, bitte stellen Sie sicher, "
 "dass alles in Ordnung ist."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Eine Nachricht erstellen"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Neue Nachricht"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Vorherige Nachricht"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
@@ -11481,129 +11626,129 @@ msgstr "%d verschickt"
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche erstellen..."
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Abse_nder"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber _Empf�nger"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "Markierung _l�schen"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr "L�sche_n r�ckg�ngig"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzuf�gen"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht erstellen"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "VOrdner �ber M_ailingliste"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter �ber _Mailingliste (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner �ber M_ailingliste (%s)"
@@ -11676,19 +11821,19 @@ msgstr "Sie haben nicht alle ben�tigten Felder ausgef�llt."
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Sie k�nnen keine zwei Zug�nge mit demselben Namen anlegen."
 
@@ -11705,14 +11850,14 @@ msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Deaktivieren"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -11798,9 +11943,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empf�nger wollen keine HTML-formatierte Mail:\n"
@@ -11844,7 +11990,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie m�ssen Empf�nger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11852,28 +11998,28 @@ msgstr ""
 "Der Entw�rfe-Ordner f�r diesen Zugang konnte nicht ge�ffnet werden.\n"
 "M�chten Sie den vorgegebenen Entw�rfe-Ordner verwenden?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11881,7 +12027,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11889,33 +12035,33 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Zum n�chsten Ordner mit ungelesenen Nachrichten gehen?"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11923,7 +12069,7 @@ msgstr ""
 "Es gibt keine neuen Nachrichten mehr in diesem Ordner.\n"
 "Wollen Sie zum n�chsten Ordner gehen?"
 
-#: mail/mail-callbacks.c:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11936,7 +12082,7 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11945,65 +12091,65 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Beschreibung"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Verschicken"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Signatur speichern"
@@ -12067,16 +12213,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Zugang %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -12737,78 +12883,74 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Tempor�re Datei '%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "�ffnen in %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (�ber %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Bilder laden"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "_�berf�llige Aufgaben:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %H.%M"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -12817,111 +12959,112 @@ msgstr "Bild speichern unter..."
 msgid "Pinging %s"
 msgstr "%s wird abgetastet"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 msgid "Mailer"
 msgstr "Mailer"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet. Klicken Sie f�r weitere "
 "Informationen auf das Schlosssymbol."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
 "nachgewiesen."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) g�ltig auf Site \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -12930,41 +13073,36 @@ msgstr ""
 "Metainformationen zum Ordner k�nnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr �ffnen k�nnen: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner k�nnen nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s k�nnen nicht gel�scht werden: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Sie k�nnen das Format eines nichtlokalen Ordners nicht �ndern."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Sie k�nnen das Format eines nichtlokalen Ordners nicht �ndern."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13205,21 +13343,21 @@ msgstr "Warten..."
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "Dieses Passwort _behalten"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort f�r %s eingeben"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
@@ -13228,11 +13366,11 @@ msgstr "Passwort eingeben"
 msgid "Could not save signature file: %s"
 msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13242,11 +13380,12 @@ msgstr ""
 "\n"
 "M�chten Sie Ihre �nderungen speichern?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML f�r diese Signatur verwenden"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Name:"
 
@@ -13286,7 +13425,7 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VOrdner"
 
@@ -13317,67 +13456,67 @@ msgstr "(Kein Betreff)"
 msgid "%s - Message"
 msgstr "%s - Nachricht"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "H�her"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Am h�chsten"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13446,46 +13585,72 @@ msgstr "Allen antworten"
 msgid "Review"
 msgstr "�berpr�fen"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Voller Name..."
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Abgeschlossen"
+
+#: 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 "Markierung _l�schen"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "F�llig am "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "_Dateiname:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Ordner unter %s auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Ordner der obersten Ebene auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "In Ordner speichern..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gew�hlt"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Bitte w�hlen Sie einen Server."
 
@@ -24313,12 +24478,12 @@ msgstr "%l.%M %d. %B"
 msgid "No description"
 msgstr "Beschreibung"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
@@ -24328,23 +24493,23 @@ msgstr "Lokale Ordner"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Einen Kanal hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Kanals ein, den Sie hinzuf�gen wollen"
 
@@ -24383,11 +24548,11 @@ msgstr "(keine Beschreibung)"
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Wetter"
 
@@ -25715,6 +25880,11 @@ msgstr ""
 "Ordner kann nicht �bertragen werden:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "�ffnen in %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25955,12 +26125,25 @@ msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Der angegebene Ordnername ist nicht g�ltig: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Ordner kann nicht umbenannt werden:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25969,12 +26152,12 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Neuen Ordner anlegen..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Neu..."
 
@@ -26004,20 +26187,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte w�hlen Sie die Informationen, die Sie importieren wollen:"
 
-#. 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 ""
-"Importieren von %s\n"
-"Importeur nicht bereit.\n"
-"Es wird 5 Sekunden bis zum n�chsten Versuch gewartet"
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26026,23 +26196,23 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26052,11 +26222,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26065,17 +26235,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26084,31 +26254,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus �lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26116,24 +26286,24 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 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:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
@@ -26161,32 +26331,32 @@ msgstr "Ordner wird synchronisiert"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ordner %s �ffnen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ordner %s �ffnen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "�ffnen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26228,44 +26398,44 @@ msgstr "Ordnername kann keine Slashes enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "�ber Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "W�hlen Sie den Ordner, den Sie �ffnen wollen"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Eine neue Verkn�pfung anlegen"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "W�hlen Sie den Ordner, auf den die Verkn�pfung zeigen soll:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -26273,27 +26443,27 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline "
 "zu arbeiten."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26312,12 +26482,12 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26328,19 +26498,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:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -26481,58 +26651,62 @@ msgstr "Verkn�pfungen"
 msgid "Checkbox"
 msgstr "Vorsitzender"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -26749,9 +26923,10 @@ msgstr ""
 "Um fortzufahren auf \"Weiter\" klicken. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -26771,26 +26946,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution-Importdruide"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution-Importeur-Druide"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Datei importieren (Schritt 3 von 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Importeurtyp (Schritt 1 von 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Importeure w�hlen (Schritt 2 von 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Eine Datei w�hlen (Schritt 2 von 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"
@@ -27007,10 +27178,10 @@ msgstr "der aktuellen Zeit"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "Aktio_nen"
 
@@ -27129,7 +27300,7 @@ msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: 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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Speichern"
 
@@ -27156,7 +27327,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: 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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Datei"
 
@@ -27238,7 +27409,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Eine Besprechung f�r diesen Eintrag ansetzen"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "My Evolution anpassen"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27289,29 +27461,30 @@ msgid "Post a message to a Public folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Ordner _abonnieren..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor f�r virtuelle Ordner..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Vorschaufl�che"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "Ordner _abonnieren..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
@@ -27408,7 +27581,7 @@ msgstr "Nachrichtenliste in Threads geordnet"
 msgid "_Expunge"
 msgstr "_S�ubern"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Ordner"
 
@@ -27725,7 +27898,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen f�r Ihren aktuellen Drucker einrichten"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27839,7 +28013,7 @@ msgstr "Umschrieben"
 msgid "_Resend..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "Werkzeuge"
 
@@ -27854,12 +28028,12 @@ msgstr "Dieses Fenster schlie�en"
 #: 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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "Schlie�en"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -28034,7 +28208,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Den Eintrag speichern und das Dialogfenster schlie�en"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -28203,7 +28377,7 @@ msgid "Open Other _User's Folder..."
 msgstr "_Neuen Ordner anlegen..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -28220,114 +28394,134 @@ msgid "Pi_lot Settings..."
 msgstr "Pilot-Einstellungen..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Pilot-Einstellungen..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "_Neuen Ordner anlegen..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Verschicken / Empfangen"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Mailkonfiguration"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Mailkonfiguration"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Informationen �ber Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verkn�pfungsleiste an/aus"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Den gew�hlten Ordner betrachten"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian-Evolution-_FAQ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "�ber Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Ordner"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Schriftart-Vorlieben"
+msgid "_Remove Other User's Folder"
+msgstr "_Neuen Ordner anlegen..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Mail-Einstellungen..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Verkn�pfung"
@@ -28570,11 +28764,11 @@ msgstr "Zeichenkodierung"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Editor f�r Suchen"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Suche speichren"
 
@@ -28654,6 +28848,54 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "<- _Entfernen"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Hinzuf�gen ->"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Suchen nach neuen Nachrichten"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Der Ordner ist nicht leer"
+
+#~ msgid "1 byte"
+#~ msgstr "1 Byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u Bytes"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Sie haben vergessen, einen Ordner zu w�hlen.\n"
+#~ "Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum "
+#~ "Ausliefern der Mail."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importieren von %s\n"
+#~ "Importeur nicht bereit.\n"
+#~ "Es wird 5 Sekunden bis zum n�chsten Versuch gewartet"
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolution-Importeur-Druide"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Schriftart-Vorlieben"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Fehler im Suchausdruck."
 
@@ -28701,15 +28943,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Non-Participants"
 #~ msgstr "Nicht-Teilnehmer"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Diese Nachricht wurde nicht versandt.\n"
-#~ "\n"
-#~ "Wollen Sie Ihre �nderungen speichern?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr "Vo_rgaben wiederherstellen"
@@ -29109,12 +29342,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Select a signature script"
 #~ msgstr "Signaturdatei-Skript w�hlen"
 
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML f�r diese Signatur verwenden"
-
-#~ msgid "_Filename:"
-#~ msgstr "_Dateiname:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML-Signatur:"
 
@@ -29200,14 +29427,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Copying"
 #~ msgstr "Kopiere"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Hinzuf�gen"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Entfernen"
-
 #~ msgid "Edit Addressbook"
 #~ msgstr "Adressbuch bearbeiten"
 
@@ -29582,9 +29801,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "_Task..."
 #~ msgstr "_Aufgabe..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Mail-Einstellungen..."
-
 #~ msgid "Configure the task view's settings"
 #~ msgstr "Einstellungen der Aufgabenansicht konfigurieren"
 
@@ -29856,14 +30072,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Name contains"
 #~ msgstr "Name enth�lt"
 
-#, fuzzy
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Verf�gbarkeitsinformationen"
-
-#, fuzzy
-#~ msgid "iCalendar information"
-#~ msgstr "iKalender-Information"
-
 #~ msgid "NT Login"
 #~ msgstr "NT-Login"
 
diff --git a/po/el.po b/po/el.po
index 63d057e74f..be4eae6090 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.1.99\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-01-16 19:40GMT\n"
 "Last-Translator: Nick Niktaris(����� ��������) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -331,11 +331,17 @@ msgstr "������������ �����"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "����� ������ ����� �����"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -346,47 +352,47 @@ msgstr "VCard ��� %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "��� ���� ������ � ������������ ��� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "������� ���������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "������� �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "������� �� ��� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "�������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "�������� ������ ��� ��� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "����������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "���� ������������� ���������� ��� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��������� ������"
@@ -405,13 +411,13 @@ msgid "EBook not loaded\n"
 msgstr "To ����k ��� ���������\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "��� ���� ������ � �������� ��� ���������� wombat"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "��� ���� ������ � �������� ��� wombat"
@@ -482,10 +488,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "���������� ��� �� ������ ��������� ������� ��� ������� �����������"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "������"
@@ -502,29 +508,39 @@ msgstr "����������� LDAP"
 msgid "LDAP server containing contact information"
 msgstr "����������� LDAP ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "������� ��� �������� ����������� ������"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "��� �����"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_�����"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "���������� ���� ������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "��� ����� ������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_����� ������"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "���������� ���� ������ ������"
@@ -573,7 +589,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "��� ���� ������ � ������������ ��� gnome-vfs"
 
@@ -581,11 +597,11 @@ msgstr "��� ���� ������ � ������������ ��� gnome-vfs"
 msgid "Other Contacts"
 msgstr "������ ������"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "��� ���� ������ �� ������� ��� ������� �����������"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -593,7 +609,7 @@ msgstr ""
 "��� ���� ������ �� ������� ��� ������� �����������.  �������� ������� ��\n"
 "� �������� ������� ��� ��� ����� �� �������� ��������� �� ����."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -604,7 +620,7 @@ msgstr ""
 "�������� ��� ����� ��������� ����� URI, � ��� � ������������ LDAP �����\n"
 "����� �����������"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -616,7 +632,7 @@ msgstr ""
 "��������� �� ��������� ��� ��� ����� CVS ���� ������\n"
 "���� ��� OpenLDAP ��� ��� �������� ��������.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -627,38 +643,51 @@ msgstr ""
 "�������� ��� ����� ��������� ����� URI, � ��� � ������������ LDAP �����\n"
 "����� �����������"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"��� ���� ������ � ����������� ���� ���������� �MAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "���������� ������ ��������� ��� %s (������� %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� ��"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "�������� ��"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "� ��������� �����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "���� ����� ��������"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "��� �������������..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -666,7 +695,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -674,25 +703,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���� ���������"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ��������� �������"
 
@@ -759,53 +788,53 @@ msgid "  S_how Supported Bases "
 msgstr "_������� ��� ��� ��������������� ������ "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _��������"
+
+#: 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 ""
@@ -946,50 +975,56 @@ msgstr "���"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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 "��' �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "��' �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "��������� �� _�����:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "������� ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "������� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "�����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1000,7 +1035,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1009,46 +1044,46 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "����������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "������� ���� ����������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "����."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1056,7 +1091,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1065,7 +1100,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1073,7 +1108,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1083,7 +1118,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1093,27 +1128,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1123,7 +1158,7 @@ msgstr ""
 "���� �� ����� �� �������������� ��� ��� ���������� ��� �����������. ����� "
 "���� ��� ��� ������� ��� �����������."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1131,11 +1166,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1144,25 +1179,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "_���� ����� � ��������� ������������"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1170,49 +1205,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "�������� ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "�������� ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "������������"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_�������� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1222,103 +1257,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "_�����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "����������� _��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "����������� Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "��' �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "���� _����������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "����� _����������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "������ ��� ������� ��������� (�����)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "����������� %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "������������-������-������"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "����� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "������������ ��� %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "������� ���������"
@@ -1333,8 +1368,8 @@ msgstr "���������� ��� �� ���������� �������� �������� ��� ������� �����������"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1365,11 +1400,11 @@ msgstr "(%d ��� �����������)"
 msgid "Unnamed Contact"
 msgstr "����� ����� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "�������� ������ ��� �� ������ �����������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "���������� ��������"
@@ -1448,7 +1483,7 @@ msgid "D_epartment:"
 msgstr "_�����:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "������������"
 
@@ -1512,13 +1547,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "��_������"
 
@@ -1546,1110 +1581,1110 @@ msgstr "URL _�������� �����������:"
 msgid "_Web page address:"
 msgstr "_��������� �����������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "�������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 #, fuzzy
 msgid "Afghanistan"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "����������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 #, fuzzy
 msgid "Andorra"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 msgid "Angola"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #, fuzzy
 msgid "Anguilla"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #, fuzzy
 msgid "Antarctica"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 #, fuzzy
 msgid "Antigua And Barbuda"
 msgstr "��������� ��� �����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 #, fuzzy
 msgid "Armenia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 #, fuzzy
 msgid "Aruba"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #, fuzzy
 msgid "Azerbaijan"
 msgstr "�������/��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #, fuzzy
 msgid "Barbados"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 #, fuzzy
 msgid "Benin"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 #, fuzzy
 msgid "Bhutan"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #, fuzzy
 msgid "Bosnia And Herzegowina"
 msgstr "������-����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 #, fuzzy
 msgid "Botswana"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 #, fuzzy
 msgid "Bouvet Island"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "��������� ����� ������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "�������� �����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr "��������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #, fuzzy
 msgid "Burundi"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 #, fuzzy
 msgid "Cambodia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 #, fuzzy
 msgid "Cameroon"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 #, fuzzy
 msgid "Cape Verde"
 msgstr "������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "���������� ��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 msgid "Chad"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 #, fuzzy
 msgid "China"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "����� �������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "����� ����� (�������)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #, fuzzy
 msgid "Comoros"
 msgstr "�������"
 
-#: 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
 #, fuzzy
 msgid "Congo"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 #, fuzzy
 msgid "Cook Islands"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "���� ������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "���������� ����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "��������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "�� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 #, fuzzy
 msgid "Eritrea"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #, fuzzy
 msgid "Falkland Islands"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 #, fuzzy
 msgid "Faroe Islands"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 #, fuzzy
 msgid "French Southern Territories"
 msgstr "�������� ������ ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #, fuzzy
 msgid "Gabon"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #, fuzzy
 msgid "Gambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 #, fuzzy
 msgid "Ghana"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #, fuzzy
 msgid "Greenland"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #, fuzzy
 msgid "Grenada"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 #, fuzzy
 msgid "Guadeloupe"
 msgstr "�������/�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #, fuzzy
 msgid "Guam"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 #, fuzzy
 msgid "Guinea"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "�������-�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 #, fuzzy
 msgid "Guyana"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr "���� ����� ��� ����� ����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "���� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 #, fuzzy
 msgid "Kazakhstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #, fuzzy
 msgid "Kenya"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 #, fuzzy
 msgid "Laos"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #, fuzzy
 msgid "Lesotho"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 #, fuzzy
 msgid "Liechtenstein"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Macau"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #, fuzzy
 msgid "Macedonia"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #, fuzzy
 msgid "Malawi"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #, fuzzy
 msgid "Malaysia"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 #, fuzzy
 msgid "Maldives"
 msgstr "�������/��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 #, fuzzy
 msgid "Mali"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 #, fuzzy
 msgid "Marshall Islands"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Martinique"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 #, fuzzy
 msgid "Mauritania"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #, fuzzy
 msgid "Mayotte"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 msgid "Micronesia"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 #, fuzzy
 msgid "Monaco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 #, fuzzy
 msgid "Mongolia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 #, fuzzy
 msgid "Montserrat"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 #, fuzzy
 msgid "Myanmar"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 #, fuzzy
 msgid "Nauru"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "���������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 #, fuzzy
 msgid "New Caledonia"
 msgstr "��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "��� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 #, fuzzy
 msgid "Niger"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 #, fuzzy
 msgid "Nigeria"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 #, fuzzy
 msgid "Niue"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "����� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "����� ������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 #, fuzzy
 msgid "Palau"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "������������ �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "������-��� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 #, fuzzy
 msgid "Philippines"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 #, fuzzy
 msgid "Pitcairn"
 msgstr "�������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 #, fuzzy
 msgid "Reunion"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "������ ����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "����� ���� ��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 #, fuzzy
 msgid "Saint Lucia"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "����� ��������� ��� �����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 #, fuzzy
 msgid "Samoa"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 #, fuzzy
 msgid "San Marino"
 msgstr "����� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr "��� ���� ��� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "�������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 #, fuzzy
 msgid "Seychelles"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "������ �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 #, fuzzy
 msgid "Solomon Islands"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 #, fuzzy
 msgid "Somalia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "����� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "����� ������� ��� ����� ���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 #, fuzzy
 msgid "Sri Lanka"
 msgstr "��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 #, fuzzy
 msgid "St. Helena"
 msgstr "���� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "����� ���� ��� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 #, fuzzy
 msgid "Sudan"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "����� ���������� ��� ���� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 #, fuzzy
 msgid "Thailand"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 #, fuzzy
 msgid "Tokelau"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 #, fuzzy
 msgid "Tonga"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "���������� ��� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 #, fuzzy
 msgid "Tunisia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "�������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "����� ������ ��� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 #, fuzzy
 msgid "United Arab Emirates"
 msgstr "������� ������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "����� ����������� ����� �������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 #, fuzzy
 msgid "Vanuatu"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "������������ �������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "������������ �������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "����� ������� ��� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "������ ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "�������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "����������"
 
@@ -2686,20 +2721,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ��������� ��� �� �����: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "������� �������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "������ �����������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "������ �����"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -2721,6 +2756,19 @@ 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "��������� �������;"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "��������� _2:"
@@ -2852,7 +2900,7 @@ msgstr "������������-������-������"
 msgid "Contact List Editor"
 msgstr "������������ ������ ������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "���������� ������ �� Vcard"
 
@@ -2902,7 +2950,7 @@ msgstr ""
 "��� �� ����� ��� ������.  ������ ���������� �� ���������;"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "����������� ���������"
 
@@ -2911,25 +2959,25 @@ msgstr "����������� ���������"
 msgid "Search"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d ������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ���� ��� �������� ��� %s"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2941,10 +2989,10 @@ msgid "Success"
 msgstr "��������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "������� ������"
 
@@ -2952,7 +3000,7 @@ msgstr "������� ������"
 msgid "Repository offline"
 msgstr "������ ������� ����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "��� ����������� � ��������"
@@ -2973,8 +3021,8 @@ msgstr "��� ������������� �� ����������"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "���������"
 
@@ -3025,7 +3073,7 @@ msgstr "������ ���������� ������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "������ ��������� ������"
 
@@ -3042,9 +3090,8 @@ msgstr "�������"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3134,7 +3181,7 @@ msgstr "������ �����������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "���������� �� (VCard)"
@@ -3220,7 +3267,7 @@ msgstr "���������"
 msgid "Paste"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3228,8 +3275,8 @@ msgstr "����������"
 msgid "Delete"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_�������� �������"
@@ -3238,7 +3285,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3246,11 +3293,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3386,7 +3433,7 @@ msgid "Include:"
 msgstr "���� ��:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "���������"
 
@@ -3411,7 +3458,7 @@ msgid "Options"
 msgstr "��������"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "���������������"
 
@@ -3434,7 +3481,7 @@ msgstr "���� �������:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "����������"
 
@@ -3496,20 +3543,20 @@ msgstr "�������� ����� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "�����"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "������"
 
@@ -3520,13 +3567,17 @@ msgstr "������"
 msgid "Undefined"
 msgstr "�������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "������ ���� ��� ����������� �� ��� ����������� �����������"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "��� ���� ������ � �������� ��� �������� ����������� ��� ���������� �������"
@@ -3641,11 +3692,11 @@ msgstr "������ ��� ������� ��������� (�����)"
 msgid "_Edit appointment"
 msgstr "����������� _��������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "��� ������� ��������� ���������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3657,13 +3708,13 @@ msgstr ""
 "�������� e-mail �� Evolution �� ��������� ��� ��������\n"
 "�������� �� ��� �������� ����������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�������������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3680,16 +3731,16 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ������������;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� ��� ��������� � �������."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "��� ���� ������ � ���������� ��� ����������� ��� ��������� �����������"
 
@@ -3738,7 +3789,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3817,9 +3868,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3836,13 +3887,13 @@ msgid "Assigned"
 msgstr "�������"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "���"
 
@@ -3862,82 +3913,102 @@ msgstr "������� ���������"
 msgid "Month View"
 msgstr "������� ����"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "������� ��� �������� �������� ��� ��������"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "������� ��� �������� �������� ����-���������"
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 #, fuzzy
 msgid "New appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� ����������� ��������"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "��� �������"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_�������"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "���������� ���� ��������"
@@ -3981,30 +4052,31 @@ 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 ""
+"���� ����� ��� ���������� email, ���� �� Evolution ��� ����������� ����� "
+"����� ��� ������ ������������.  ��� �� ��������� �� �������������� ��� "
+"�������� ��� ���� ��� ����������."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "������ ���� ��������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "�������� ����:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "��������� �����������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "�������� ������������:"
 
-#: 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 ""
-"���� ����� ��� ���������� email, ���� �� Evolution ��� ����������� ����� "
-"����� ��� ������ ������������.  ��� �� ��������� �� �������������� ��� "
-"�������� ��� ���� ��� ����������."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "�� ����� ��� �����������:"
@@ -4028,110 +4100,110 @@ msgstr "����"
 msgid "minutes"
 msgstr "�����"
 
-#: 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:322
 msgid "1 day"
 msgstr "1 �����"
 
-#: 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:330
 msgid "1 week"
 msgstr "1 ��������"
 
-#: 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:338
 msgid "1 hour"
 msgstr "1 ���"
 
-#: 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:346
 msgid "1 minute"
 msgstr "1 �����"
 
-#: 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:354
 msgid "1 second"
 msgstr "1 ������������"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.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:391
 msgid "Send an email"
 msgstr "�������� e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:401
 msgid "Unknown action to be performed"
 msgstr "�������� �������� ���������"
 
-#: 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: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: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: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: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:438
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ��� ����� ��� ��������"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s ���� %s"
 
-#: 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 ��� ������� ���� �������������"
@@ -4152,7 +4224,7 @@ msgstr "������������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4235,7 +4307,7 @@ msgid "Days"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "���������"
 
@@ -4248,7 +4320,7 @@ msgid "Minutes"
 msgstr "�����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "�������"
 
@@ -4258,7 +4330,7 @@ msgid "S_un"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "�������"
 
@@ -4271,7 +4343,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "�������� ������� ��������� ���� ��������� �����������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "�������"
 
@@ -4290,7 +4362,7 @@ msgid "Task List"
 msgstr "_����� ��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "������"
 
@@ -4307,7 +4379,7 @@ msgid "Time format:"
 msgstr "����� ����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "�����"
 
@@ -4316,7 +4388,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "�������"
 
@@ -4546,8 +4618,8 @@ msgid "No summary"
 msgstr "����� ��������"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "���������� ��..."
 
@@ -4617,27 +4689,27 @@ msgstr "������������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ������������"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "��������"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "������������"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "���������"
 
@@ -4709,19 +4781,19 @@ msgstr "_������ �����:"
 msgid "_Start time:"
 msgstr "������ �_������:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "���������� ���� �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "���������� ����������� ���� ���������������."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "���� �� ����� ����� ��� �� ���������!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_������������� ��..."
 
@@ -4761,7 +4833,7 @@ msgid "Member"
 msgstr "�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4773,7 +4845,7 @@ 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
@@ -4851,48 +4923,48 @@ msgstr ""
 "���� � ��������� �������� ����������� ��� �� Evolution ��� ������ �� "
 "������������."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "������������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "���� ���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "����������"
 
@@ -4990,7 +5062,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "������� ��������"
 
@@ -4999,7 +5071,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -5011,17 +5083,17 @@ msgstr "_�������������"
 msgid "_Status:"
 msgstr "_���������:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5091,12 +5163,12 @@ msgid "100%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�������"
@@ -5106,30 +5178,30 @@ msgstr "_�������"
 msgid "_Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5158,12 +5230,12 @@ msgstr "_�������� �������� �� �������������"
 msgid "_Delete Selected Tasks"
 msgstr "_�������� ����������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "���������� ������������"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���� ��� ��� �������� ��������"
@@ -5172,8 +5244,8 @@ msgstr "���� ��� ��� �������� ��������"
 msgid "Alarms"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "������������"
 
@@ -5202,7 +5274,7 @@ msgid "Start Date"
 msgstr "���������� �������"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "��������"
@@ -5269,124 +5341,124 @@ msgstr "��"
 msgid "pm"
 msgstr "��"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "��� _������� ��������� ��� ������"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "���������"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "��� �������"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "��������..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "������� ��� _������"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_������� ���� ����������..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "����_������ ����������� ��������������"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "���������� ���� � /%s"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "���������� ���� � /%s"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�_��������� ��..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "��������������� _����������"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� �� i_Calendar"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "�� ����� ���� � �������� _������������"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "�������� ����� ��� _���������"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "�������� �_��� ��� ����������"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "�� �������� GNOME Pilot �������� �� ��� ����� ������������� �' ���� �� "
 "�������."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ���� ��� �������� ���%s."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "���������� ����:<b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "������������ "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "����������� iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "������ iCalendar"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "��� ������� �����"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5394,337 +5466,343 @@ msgstr ""
 "<br> �������� �������� ��� �������� �����������, ��� �������� ���� ��� "
 "�������� ��� �� �������� �����."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>������</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "���������� ����: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_���������:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "������ ���������"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "�������� ��� ��������:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "�������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "�������� ���������� ���������"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "�������� ���������� �����������"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ���� ����������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "����������� ����������"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� ���������."
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �� ����� �� ��������� ��� ���������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "����_�� ��������� ����������"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ���� ��������� �� ��� ��������� �� ���������."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ������� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "�/� <b>%s</b> ������� ��� ���������� ������."
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "��������� ������ ����������"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ���� ����������� ����������� ��������."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "����������� ��������"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� �������."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �� ����� ��� ��������� ���������� ��������."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "������ _�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��� ������� ��������"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ���� �������� ��� �������."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr " ������ ��������"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ���� ���������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "�/� <b>%s</b> ���� ����������� ��������������."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�/� <b>%s</b> �������� ���� ������ ��������������."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "��������� ������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "� ������� �������� �� ���� ������������ �����."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "�� ������ �������� ���� �������� ��� ��� ��������������"
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "�� �������������� ������ ��� �������� ������ ������ �����������"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "�� �������������� ������ �������� �������� ��� ��� ������� �� ����������"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "� �������� ������������\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "��� ���� ������ �� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
 "��� ������� �����"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "��� ���� ������ � ��������� ��� ���������� ��������������� ���� ���� �� "
 "������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "������� �� ������� ������� ��� `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "� ��������� ��������������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "� �������� ������������"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "�� �������� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������� �������"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������� �������"
@@ -5770,7 +5848,7 @@ msgstr "���������� �������"
 msgid "Chair Persons"
 msgstr "����� ����������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "����������� �������������"
 
@@ -5784,52 +5862,52 @@ msgid "Resources"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "�������"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "���������"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "����������� ����������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "������������ ����������"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "��-����������"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�����������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "���������������"
 
@@ -5919,43 +5997,50 @@ msgstr "������ �_������ ����������:"
 msgid "Meeting _end time:"
 msgstr "������ _��������� ����������:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "������� ��������� ��� %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "������� � ������� ��������� ��� `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "������ ���� ��� �������� ��� %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���������� �����������"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "����������� � �������"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "��� �_�������..."
 
@@ -5969,7 +6054,13 @@ msgstr "������� �� ������� ������� ��� `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "���������� ���� %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5977,7 +6068,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5985,12 +6076,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������� ����������� ��� %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "������� ������� %s"
@@ -6051,49 +6142,58 @@ msgstr "���������"
 msgid "September"
 msgstr "�����������"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "���������� ����������� ���� ���������������"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "������ �� ������� ���� ����������."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "���������� ����������� ���� ���������������"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "����������� ���������"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "����������� ��������"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "���������� ��������������"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "���������� �������������� (%s ��� %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "����������� iCalendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "������ �� ����� ��������������� ��� ���� �� �������."
 
@@ -6330,7 +6430,7 @@ msgid "Print Calendar"
 msgstr "�������� �����������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "������������� ���������"
@@ -6354,7 +6454,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "�� URI ��� ������� ��������� ���� ��������"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6367,12 +6467,12 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "�� ��� ��������� � �������."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "�������� ������"
@@ -6446,17 +6546,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "��� ����� ������ � ������� �� ��� �������: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "����������"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "������ �����������"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6465,118 +6565,123 @@ msgstr ""
 "�� Evolution ����� �������� Pine\n"
 "������ �� ��������� ��� Evolution;"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "����������"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "� ������ ��������� ���� 0 �����������"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "����������� ������� ��� ������ ��� ��� ���������"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "����������� ������� ��� ������ �� ����� � ���������� 1 ��������"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "����������� � ���������� ������ 1 �� ����� �������� ����������/������ ISO "
 "8601"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "� �������� ������ ������ ���������� �� ���� 2 �����������"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 "� �������� ������ ������ ���������� �� ���� �� ��������� 2 ���� �������"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "� ���� ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "�� ������ ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "�� get-vtype ���������� �� ���� 0 �����������"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "� �������� ��� �������� ���������� ��� ������� ���� boolean"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "���� ������"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8174,82 +8279,82 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 "������ �� ����� ���������� ��� ������ ��� �� ����������� ���� � ����������"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ���� ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���� �������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�������� ���� ��� ��������������� ��� ���������."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "�� ������ ����������"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "�� ������ ����������"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���� �������� ���������� �������: %s: %s"
@@ -8295,11 +8400,11 @@ msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "�� �������������� ����������: ��������� ����� ���������� ������: ��� %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "���������� ���������"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "��������� ��������� ��� %s"
@@ -8624,7 +8729,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
@@ -8686,52 +8791,52 @@ msgstr "��� ���� ��� SMTP ������������� �� ����� ��-pop �����"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "� ����������� ��������� '%s'���������� ��� ��������� �������� ������"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "� ����������� ��������� '%s' ���������� ��� ��������� �����"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�������� ���������� �����������: %s: �������� �����"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "���������� � ������� %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "�������� ���������� �����������: %s: �������� �����"
@@ -8932,7 +9037,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8941,11 +9046,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8967,7 +9072,7 @@ msgstr ""
 "������ �� �� �������� ����� � �����;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9023,68 +9128,76 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 "��� ���� ������ � ����������� ��� ������� %s: ��� ������� ������� �������"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "� ���������� ���������"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "����������� ���������� ��� ����������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "����������� �������� ��� ��� ���������� IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "����������� �������� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "� ������ IMAP �������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "� ����������� ��� ��� ���������� ������������ ��� �����."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� �������� �� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "��� ���� ������ � ������� ��� ��������� ���  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "������� ������ ��� ��������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "�������� ���� ��� ��������������� ��� ���������."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9100,28 +9213,24 @@ msgstr ""
 "��� ������ �� ����� � ���� ��� ���������: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "��� ������� ������ ������"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "�� ������ ��� ����� ��������� ���� ��� ������"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "���� ����������� ��������� ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "������� ������ ��� ��� ��������"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9138,6 +9247,11 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "������� ��� ��� ��������"
@@ -9187,78 +9301,73 @@ msgstr ""
 "�� ��� ������� ���� �� ����� ������� ���� ���������� IMAP �� ����� ������� "
 "����� ��������."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s �������� ��� %s ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "� ������� ���������"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "��� ���� ������ � ������� ��� %s (���� %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "� ���������� ��� �������������"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "� ����������� �������."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "� ������� ��� ����� ������"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "� ����������� IMAP %s ��� ����������� ��� ��������� ���� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�� ��������������� ����� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "��� ����� ������� ������ ���������."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9269,24 +9378,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ������� ������� ������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "� ������� ��� ����� ������ �� �������� �� ������� ����������."
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9359,8 +9468,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "� ������� ��� root %s ��� ����� ������� ����"
@@ -9372,7 +9481,7 @@ msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "��� ����� ������ � ���� ��� �������: %s: %s"
@@ -9386,33 +9495,33 @@ msgstr "�� ������� �������� ��� ����� �����������"
 msgid "Local mail file %s"
 msgstr "������ ������ ��������� %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� %s ��� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "��� ���� ������ � �������� ��� ������� ��������� ��� ������� `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "��� ���� ������ � �������� ��� ������� ������������ ��� ������� `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ���������:%s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "��� ���� ������ � �������� ��� ��������� ���� �������� : ������� �����"
 
@@ -9432,6 +9541,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9443,12 +9553,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9474,7 +9586,8 @@ msgid "not a maildir directory"
 msgstr "��� ����� ��������� maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "��� ���� ������ � ������ ��� ������� `%s': %s"
@@ -9504,7 +9617,7 @@ msgid "Storing folder"
 msgstr "������� �����������"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "��� ���� ������ �� �������� ��� ������� ��� %s: %s"
@@ -9673,40 +9786,45 @@ msgstr "`%s' ��� ����� ���������"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "��� ����� ������ �� ������ � ���� ��������� ��� ��: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "� �������`%s/%s' ��� �������."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ��� ����� �������� ������."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "������������ � ������� '%s'"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -9800,50 +9918,50 @@ msgstr "�����"
 msgid "Operation failed: %s"
 msgstr "� ���������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "�������� ��������� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "� ���������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "��� ����� ������ � ���� ��� �������: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "�������� ��� ������������ ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "�������� ��������� ��� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "��� ������ �� ����� � ���� ��� ���������: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "������� ������������ ������������"
@@ -10126,46 +10244,46 @@ msgstr "��������� �������� ������������"
 msgid "Authentication required"
 msgstr "���������� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "�� ������ ������� �� ��� ���� ���������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10176,94 +10294,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� ��������� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: � ��������� ��������� ��� ����� "
 "������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "������ ���� ��� ���������� ��� ������������ ������������ SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "� ������ ������������ �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "��������� �������� ������������ ��� ��� �����������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "������ MAIL FROM ����� ������: %s: �� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "������ ��������� MAIL FROM: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "������ RCPT TO ����� ������: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
@@ -10271,82 +10389,73 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "����� ������ � �������� DATA: ����������� ���������:  %s: �� ������ ��� "
 "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "������ ��������� RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "���������"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "�������� ����������� ������������ ��� ��� �������� �����������"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "��� ���������..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "��������� ������� ��� ������"
 
@@ -10378,7 +10487,7 @@ msgstr "����� MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "������� ��� �������� ������� ��� ����������"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ������� �����������"
 
@@ -10389,45 +10498,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "�������� ��:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "���:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "�������� ���� ���������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "��������� �����������:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10438,12 +10547,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_����:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "����� ���������"
@@ -10458,7 +10567,7 @@ msgstr "��������� �������"
 msgid "Could not create a PGP signature context"
 msgstr "��� ���� ������ � ���������� ������������ ��������� PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10467,34 +10576,34 @@ msgstr ""
 "������ ���� ��� �������� ��� ������� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "�������������!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "�� ������ �������, �� ����� ���������;"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ���� �� ������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "������� � �������� ��� ��������� ��� ��� �����������"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10503,14 +10612,14 @@ msgstr ""
 "������� � ��������� ��� ������: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10519,7 +10628,7 @@ msgstr ""
 "������ ���� ��� �������� ���������� ��� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10528,28 +10637,39 @@ msgstr ""
 "����������� ��������.\n"
 "������ �� ����� ���������� �������� ����;"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"���� �� ������ ��� ���� ������.\n"
+"\n"
+"������ �� ������������ ��� �������;"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "�������������: ������������� ������"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "������� �������"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "���������� ���������"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10557,7 +10677,18 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ������� ��� �������� �����������."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
+"������� � ������������ ��� ���������� ��� ����������� HTML."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10565,13 +10696,13 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ��� ����������� HTML."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10579,8 +10710,9 @@ msgstr ""
 "��� ���� ������ � ������������ ��� ��������� ��� ����������� ������\n"
 "��� ����� �������� ����� ��������� ��� ��������� ������������."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "��� ����� ������ � ������������ ��� ����������� ��� Evolution"
 
 #: data/evolution.desktop.in.h:1
@@ -10631,8 +10763,8 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10782,7 +10914,8 @@ msgid "years"
 msgstr "������"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "�������� �� ��������� ����������."
 
 #: filter/filter-datespec.c:269
@@ -10838,15 +10971,12 @@ msgid "Add action"
 msgstr "�������� ���������"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"�������� �� ������� ���� ������.\n"
-"��������� ���� ��� ������ ���� ������ ������ ��� ��� �������� ��� ���������."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "����� ����:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "������� �������"
 
@@ -10857,7 +10987,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "���������"
@@ -11045,228 +11175,232 @@ 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:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "�����������"
 
-#: 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
-#, fuzzy
-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
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "�������� ��"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "�������"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "�����"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "���� ����"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "���� ����"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-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
-#, fuzzy
-msgid "is not Flagged"
-msgstr "����������"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "_����������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "����� ������������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "���������� �� ������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "�������� ��������� ��� �����"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "�������� ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "���������� �����"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "���."
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "����� ���������� ���"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "����� ��������� ���"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "������� ����������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "������� (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "�������� �� �����"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "������ ��"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "����������� ������������"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "������� ����������"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "��� ��������"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "��� ��������� ��"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "��� �������"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "��� �������"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "��� �������� �� �����"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "��� ������ ��"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "�������� ��"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "�������"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "���� ����"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "���� ����"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "����� ���������� ���"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "����� ��������� ���"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "��� �����"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "�����"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "����� ���������� ���"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "����� ��������� ���"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "���."
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "�������� �� �����"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "������ ��"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�������"
@@ -11300,31 +11434,31 @@ msgstr "������ �� �������� ����������� ���� ������ ��� ����."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ������� �� ������ ��� Elm ��������"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "������� ��������..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "�������� ����������"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "��������� %s �� %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "������� ������ ��� %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "��������"
 
@@ -11385,39 +11519,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "�� Evolution ������� �� ������ ��� �������� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�����������"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "������ ������ ��������� %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "��������� � ���������"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "�������� ���������"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "����������� �������"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11536,26 +11670,36 @@ msgid "Folder containing mail"
 msgstr "������� ��� �������� ��������"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "�������"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "������� ��� �������� ��������"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "�������� �����������"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "��������� ������� ������������"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "����� � ������� ��� ������ �� �������� ��������."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "���������..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "������ ��� ��������� ��� �������"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11563,83 +11707,84 @@ msgstr ""
 "������� ��� ��� ��������� ��� ������������ ��� �������� �� ����� "
 "��������������, �������� ������� ��� ��� ����� �����."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "��� ����� ������ ����� �������� ��� ���������"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "�������������: ������������� ������"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "��� ������ ������������"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "�������� ���� ���������"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "��� ������"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "����������� ������"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "�������� ���� ���������"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ��������� ��� Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� �������� ��������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ����������� ������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "������� ���� ����������..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "��� ����� ������ �� ����� ���������� ����������� �� �������"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "��������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
@@ -11684,140 +11829,140 @@ msgstr "%d �����������"
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "���������� ��������� ������� ��� �� ������"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "�������� ��� _����"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "�������� ���� _���������"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "�������� ����� ����������"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "�������� ���� ����� _������������"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "������ ��� ����"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "������ ���� ���������"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "������ ���� ����� ������������"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_����������� �� ��� ������..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "������������"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "����������"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "������� _�� �����������"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "������� _�� �� �����������"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "������� _�� ���������"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "������� _�� �� ���������"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_������ ���������"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�������� ��������� ��� ������ �����������"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�������� �������"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "���������� ������ ��� �� ������"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�������� ���� ����� ������������"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�������� ���� ����� ������������ (%s)"
@@ -11891,20 +12036,20 @@ msgstr "��� ����� ����������� ��� ��� ������������ �����������."
 msgid "Evolution Account Editor"
 msgstr "������������ ����������� Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "_����� ������:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "��� ����������� �� ������������� ��� ������������ �� �� ���� �����."
 
@@ -11921,14 +12066,14 @@ msgid "Really delete account?"
 msgstr "�� ��������� � �����������;"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "��������������"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "������������"
 
@@ -12017,9 +12162,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "�� �������� ������ �� ����� HTML, ���� � �������� ���������� ��� ��������� "
 "�������� �� ����� HTML:\n"
@@ -12064,7 +12210,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������� ����������� �� �������� ���� �� ������."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12073,28 +12219,28 @@ msgstr ""
 "����������.\n"
 "������ �� ������ ����� ��� ��' ������� ���������� �������;"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "���� �������� ����������"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "���� %d/%b/%Y, ����� %A ��� ��� %H:%M, �/� %%s ������:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "���������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "��������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "����� ������� ��� ������ �� �������������� ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12102,7 +12248,7 @@ msgstr ""
 "����������� �� �������������� ���� ��\n"
 "�������� ���� �������� ������."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12110,39 +12256,39 @@ msgstr ""
 "����������� �� ������������ ���� ��\n"
 "�������� ��� ��� ������ �����������."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "����� ������� ��� ������ �� ������������ ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "��� ���� �������� ������"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "��������� �������;"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "�������� �������� �� ������������ ���������"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12154,7 +12300,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12163,65 +12309,65 @@ msgstr ""
 "������ ���� �� ������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "���������� US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "������� � �������� ��� ���������"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "����� ������� ��� ������ �� �������� ��� �� %d �������� �� ���� ��������;"
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "����� ���������"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "����� ����� �����"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "�����������"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "�������� ���������"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "���������� ���������"
@@ -12283,16 +12429,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "������ ����������� Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�����������"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "������� ������� ���������"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "������� ���� ����������..."
 
@@ -13015,78 +13161,74 @@ msgstr "��� ���� ������ � ���������� ������������ ������� S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "��� ���� ������ � ���������� ������������ ���������������� S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "���������� ����������..."
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "���������� ����������..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "������� ���� ��� ������"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "������� �� %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "������� ���� ��� ������ (���� %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "��������"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "��������� ��������� ��������"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "������� _�������"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "������� ����������� ���������"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "�������� ��� ����� ����:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "������� ��������� ���� ���������"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "��������� ����� �����������"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "���������� ������� ��..."
 
@@ -13095,112 +13237,113 @@ msgstr "���������� ������� ��..."
 msgid "Pinging %s"
 msgstr "������� ������ ��� %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr " %s ���������"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ���� ������ � ������� ��� ��������� MIME. ������� �� ����."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "��������� ���������"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "�������� ��"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "��������� �����������"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "������������ ������������: "
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� �� ������ ����� ������� �������������. ����� ���� ��� ��������� �� �� "
 "������� ��� ������������ �����������."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "��� ���� ������ � ���������� ������������ ����������� PGP."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ������� �� ����� ���������."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
 "���������."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "������� �� ������ FTP (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "������� �� ������ ������ (%s) ������ ���� ������ \"%s\""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "������� �� ������ ������ (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "������� �� ������������� �������� (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "������� �� ������� ��������� �������� (����� \"%s\")"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "��������������� ��������� ����� ���������."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "������� �������"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "������������ �������"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13209,27 +13352,22 @@ msgstr ""
 "��� ����� ������ �� ����������� � ������� metainfo, ������ �� ������������\n"
 "��� ��� �������� �� �������� ����� ����� ��� ������: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "��� ����� ������ �� ����������� � ������� metainfo ��� %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "��� ���� ������ �� ��������� � ������� metadata %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "������� ������ ��� ������� \"%s\" �� ����� \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s ��� ����� ������ �� ��������� ���� ����� ��� ����� ������� �������"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13237,15 +13375,15 @@ msgstr ""
 "�� ��� �������� �� �������� ����� ���� �� maibox, ����\n"
 "�� ������ �� �� ����������� ����� ���."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "��� �������� �� �������� �� ����� ���� ��-������� �������."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "���������� ���� � /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "��� �������� �� �������� �� ����� ���� ��-������� �������."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13486,22 +13624,22 @@ msgstr "�������..."
 msgid "User canceled operation."
 msgstr "� ������� ������� ��� ����������."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_������������� ����� ��� �������"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 "������������� ����� ��� ������� ��������� ��� �� �������� ��� ���������"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�������� ������ ��������� ��� %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "�������� ������ ���������"
 
@@ -13510,11 +13648,11 @@ msgstr "�������� ������ ���������"
 msgid "Could not save signature file: %s"
 msgstr "��� ���� ������ � ���������� ��� ������� ���������"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "���������� ���������"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13524,11 +13662,12 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� ������� ����;"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_�������� HTML:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "�����:"
 
@@ -13568,7 +13707,7 @@ msgstr ""
 "    '%s'\n"
 "��� ���� ���������."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "��������"
 
@@ -13598,67 +13737,67 @@ msgstr "(����� ����)"
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "�������� ��������"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "����������"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "�����"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "���������"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "������ %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "���������� ������ ���������"
 
@@ -13733,45 +13872,71 @@ msgstr "�������� �� �����"
 msgid "Review"
 msgstr "�������������"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "������������"
+
+#: 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 "����������"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "���� "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "����� �������:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "������ ������� ���� ��� %s ��� \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "������ ��� ������� ������� ��� \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�������� ���� ������ \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� ��������� ���� ������ \"%s\""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�������"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "���������� ��� ������..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "��� ���� �������� �����������"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "�������� �������� ����������."
 
@@ -24784,12 +24949,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "����� ���������"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "������ ���������"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "������� �������"
 
@@ -24799,23 +24964,23 @@ msgstr "������� �������"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "������� ������"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "�������� ����������� ��������"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��������� ��� ����������� ��������� ��� ���� ��� ������ �� ����������"
 
@@ -24854,11 +25019,11 @@ msgstr "(����� ���������)"
 msgid "My Weather"
 msgstr "� ������ ���"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "������"
 
@@ -26191,6 +26356,11 @@ msgstr ""
 "������� � �������� ��� �������:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "������� �� %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -26435,12 +26605,25 @@ msgid "Rename folder"
 msgstr "����������� �������"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "�� ������������ ����� ������� ��� ����� ������: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"��� ���� ������ � ����������� ��� ������� :\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26449,12 +26632,12 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ������������� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "���������� _���� �������.."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "���..."
 
@@ -26484,20 +26667,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "�������� �������� ��� ���������� ��� ������ �� ��������:"
 
-#. 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 ""
-"��������� �� %s\n"
-"� ���������� ��� ����� �������.\n"
-"������� 5 ������������� ��� ���������."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26506,22 +26676,22 @@ msgstr ""
 "��������� �� %s\n"
 "��������� �� ��������%d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "������� �������"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "�� ������ %s ��� �������"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "������ Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26530,11 +26700,11 @@ msgstr ""
 "��� ������� ���������� ��� �� ������ �� ��������� ��\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26543,17 +26713,17 @@ msgstr ""
 "��������� �� %s.\n"
 "������ �� %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ���� ��� �������� ��� %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ���� �� ������� ��� %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26562,31 +26732,31 @@ msgstr ""
 "��������� �� %s\n"
 "��������� �� �������� 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "����� �������:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "�������� ��� ������"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "����� �������:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "�������� ��������� ��� ��������� ��� ���������� �����������"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "�������� ��������� �������"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26594,24 +26764,24 @@ msgstr ""
 "�������� ����������...\n"
 "������� ������ ��� ���������� �������������"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "�������� ��� ������� ����������"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "��� %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "������� �������"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "�������� ���� ������ ���������� ��� ��� �������� ����� ��� ���������"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
@@ -26639,32 +26809,32 @@ msgstr "������������ �������"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "������� ������� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "������� ������� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������� �� %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26709,44 +26879,44 @@ msgstr "�� ����� ��� ������� ��� ������ �� �������� ��������."
 msgid "'.' and '..' are reserved folder names."
 msgstr "�� '.' and '..' ����� ��������� ������� �������."
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "��� ���� ������ � �������� ��� Bug buddy"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "���� ��� Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "�������� ��� ������..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "�������� ��� ������ ��� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "���������� ���� �����������"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ��� ������ ��� �� �������� �� ��� ����������:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
@@ -26754,27 +26924,27 @@ msgstr "����� ����� �������"
 msgid "(No folder displayed)"
 msgstr "(��� ����������� �������)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "�� Ximian Evolution ����� ��������� ��� ������. ����� ���� ��� ������� ��� "
 "�� �������������."
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "�� Ximian Evolution ����� ���� ���������� ����������� ��� �� ������."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26793,12 +26963,12 @@ msgstr ""
 "�� ������ ��� �� ������� ������������� �����:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "��� ���� ������ � ���������� ������� ����������� -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26809,19 +26979,19 @@ msgstr ""
 "������������� ����������. �� ��������� �� ������������ �� Evolution ���\n"
 "�� �� ���������� ���� ��� �� ����� ���� �������� ��� ��������."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "�� ������ ����������"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "��� ���� ������ � ������� ��� OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "��� ������� � ���� ��������� ���������"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "������ ������"
 
@@ -26961,60 +27131,64 @@ msgstr "������������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "����� ������"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "������� ��� ������� �� ���� �� �����"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "� ������������ ����� ������� ��� ����� �������"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "������ �/�"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "��� ������� ������� ����� ��� ��� ���������� ��� �������"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "� ������� ��� ����� ������"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "� ������������ ������� ��� �������"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr " � ���������� ���� ��� ���� ����������� �� ���� ��� �������"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "� ���������� ��� �������������"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr ""
 "��� ������� ����������� ��� ��� ������������ ���� �� ���� �� ����������"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 "��� ����� ������ �� ������������ � �� ����������� � ������������� ������� "
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "��� ���� ������ � ���������� ������� �� ���� �� �����"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -27232,9 +27406,10 @@ msgstr ""
 "�������� �������� �� ������� \"�������\" ��� ��� ��������. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -27254,26 +27429,22 @@ msgid "Evolution Import Assistant"
 msgstr "������ ��������� ��� Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "������ ��������� ��� Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "�������� ������� (���� 3 ��� 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "����� ��������� (���� 1 ��� 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "�������� ���������� (���� 2 ��� 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "�������� ��� ������ (���� 2 ��� 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"
@@ -27493,10 +27664,10 @@ 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-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "�_��������"
 
@@ -27615,7 +27786,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "����������"
 
@@ -27642,7 +27813,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_������"
 
@@ -27724,7 +27895,8 @@ msgid "Schedule a meeting for this item"
 msgstr "�������������� ��� ��������� ��� ���� �� ��������"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "������������� ��� ����� ��� Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -27777,30 +27949,31 @@ msgid "Post a message to a Public folder"
 msgstr "���������� ��������� ���� ������"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_�������� ����� ��������..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "�������� ������ ��������������"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "�������� � ��������� ��������� �� �������� �� ��������������� �����������"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_������������ ��������� �������"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_������..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_����� ��������������"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_�������� ����� ��������..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "������ ��� ��������� ����� ��� �������"
@@ -27897,7 +28070,7 @@ msgstr "����� ��������� ���� ����"
 msgid "_Expunge"
 msgstr "_��������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_�������"
 
@@ -28215,7 +28388,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "������ �������� ��� ���� ��� ��������� ��� ��������"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "�������� ��� ���������� ������� ��� ��� �������� ��������"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -28329,7 +28503,7 @@ msgstr "�� �������"
 msgid "_Resend..."
 msgstr "_�����������..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_��������"
 
@@ -28344,12 +28518,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:43
+#: 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:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_�������"
 
@@ -28524,7 +28698,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_�������"
 
@@ -28693,7 +28867,7 @@ msgid "Open Other _User's Folder..."
 msgstr "���������� _���� �������.."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -28710,114 +28884,134 @@ msgid "Pi_lot Settings..."
 msgstr "��������� ���������� _�������..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "��������� ���������� _�������..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "���������� _���� �������.."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "�������� / ����"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�������� ��������� �� ������� ��� ���� ����"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "��������� ������������"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "��������� ������������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ����������� ������� �� �� Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "������� ������� �����������"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "������� _������� �����������"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ��� �������� �� ����� ��� Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "��������"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "�������� ��� �������� ��� ������."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "������� ����������� �������"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "������ ��������� ��� �� Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_���� ��� Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_���������..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_������ �������"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_�������"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_��������..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_����������..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_���"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "���� _�������"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_����� ������������"
+msgid "_Remove Other User's Folder"
+msgstr "���������� _���� �������.."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_�����������..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_�������� / ����"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_��������� �������������..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_������ ������������"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_����������"
@@ -29060,11 +29254,11 @@ msgstr "������������ ����������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "������������ ����������"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "���������� ����������"
 
@@ -29144,6 +29338,55 @@ msgstr "init_corba(): ��� ���� ������ � ������������ ��� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " _��������"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_��������"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "������� ������ ��� ��� ��������"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "� ������� ��� ����� ������"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u byte"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "�������� �� ������� ���� ������.\n"
+#~ "��������� ���� ��� ������ ���� ������ ������ ��� ��� �������� ��� "
+#~ "���������."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s ��� ����� ������ �� ��������� ���� ����� ��� ����� ������� �������"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "��������� �� %s\n"
+#~ "� ���������� ��� ����� �������.\n"
+#~ "������� 5 ������������� ��� ���������."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "������ ��������� ��� Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_����� ������������"
+
 #~ msgid "Error in search expression."
 #~ msgstr "������ ���� ������� ����������."
 
@@ -29188,15 +29431,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "��-�������������"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "���� �� ������ ��� ���� ������.\n"
-#~ "\n"
-#~ "������ �� ������������ ��� �������;"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (��' �������)"
@@ -29507,14 +29741,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Select a signature script"
 #~ msgstr "�������� ���� ����� ��� ���������"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_�������� HTML:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "����� �������:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_�������� HTML:"
 
@@ -29546,14 +29772,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Riga"
 #~ msgstr "�����:"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_��������"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr " _��������"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "����� ������� ��� ��� �������� ��� ������� \"%s\";"
 
@@ -29882,9 +30100,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgstr ""
 #~ "��� ���� ������ � ������ ��� ���������� ��� ���� ����� ���������������!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "���������� �������������� (%s ��� %s)"
-
 #, fuzzy
 #~ msgid "Error hashing password."
 #~ msgstr "������ ��������� ������"
@@ -30196,9 +30411,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_�������..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_��������� �������������..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "�������� �� _���������"
 
@@ -30261,9 +30473,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ "� ���������� ��� ����������� ���� �������. �� ��������� ����������� "
 #~ "������;"
 
-#~ msgid "iCalendar information"
-#~ msgstr "����������� iCalendar"
-
 #~ msgid "This is an encrypted message part"
 #~ msgstr "���� �� ������ ��� ��������� ����� ���������������"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 7f741c4961..1bf8480015 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -318,11 +318,16 @@ msgstr ""
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+msgid "Unnamed List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -333,46 +338,46 @@ msgstr ""
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 msgid "Reconnecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr ""
 
@@ -389,13 +394,13 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr ""
@@ -462,10 +467,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr ""
@@ -482,27 +487,36 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:77
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr ""
 
@@ -539,7 +553,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: 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"
 
@@ -548,24 +562,24 @@ msgstr "Could not initialise gnome-vfs"
 msgid "Other Contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 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:487
+#: addressbook/gui/component/addressbook.c:490
 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:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -573,43 +587,53 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 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:613
-#: addressbook/gui/component/addressbook.c:616
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, 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
 #, c-format
-msgid "Enter password for %s (user %s)"
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -617,7 +641,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -625,25 +649,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -709,47 +733,47 @@ msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
+msgid "1234"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:13
@@ -877,45 +901,51 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Select"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Selected:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -926,7 +956,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -935,44 +965,44 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -980,7 +1010,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -989,7 +1019,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -997,7 +1027,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1007,7 +1037,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1017,34 +1047,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1052,11 +1082,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1065,24 +1095,24 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1090,43 +1120,43 @@ msgstr ""
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1136,91 +1166,91 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Evolution attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_More Options >>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "searching-tab"
 msgstr ""
 
@@ -1234,8 +1264,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1266,11 +1296,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 msgid "Find contact in"
 msgstr ""
 
@@ -1341,7 +1371,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr ""
 
@@ -1398,13 +1428,13 @@ msgstr ""
 
 #: 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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr ""
 
@@ -1432,1024 +1462,1024 @@ msgstr ""
 msgid "_Web page address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Comoros"
 
-#: 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
 msgid "Congo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr ""
 
@@ -2484,20 +2514,20 @@ msgstr ""
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr ""
 
@@ -2517,6 +2547,18 @@ msgid ""
 "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
+msgid "Overwrite"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
@@ -2647,7 +2689,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2693,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr ""
 
@@ -2702,24 +2744,24 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2731,10 +2773,10 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr ""
 
@@ -2742,7 +2784,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2763,8 +2805,8 @@ msgstr ""
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr ""
 
@@ -2812,7 +2854,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr ""
 
@@ -2827,9 +2869,8 @@ msgstr ""
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -2915,7 +2956,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2992,7 +3033,7 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3000,8 +3041,8 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 msgid "Current View"
 msgstr ""
 
@@ -3009,7 +3050,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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 ""
 
@@ -3017,11 +3058,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3145,7 +3186,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr ""
 
@@ -3170,7 +3211,7 @@ msgid "Options"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr ""
 
@@ -3193,7 +3234,7 @@ msgstr ""
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr ""
 
@@ -3255,20 +3296,20 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr ""
 
@@ -3279,13 +3320,17 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3394,11 +3439,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3406,13 +3451,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3423,15 +3468,15 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3480,7 +3525,7 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3554,9 +3599,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3573,13 +3618,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr ""
 
@@ -3599,74 +3644,90 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 msgid "Create a new all-day appointment"
 msgstr ""
 
@@ -3708,25 +3769,25 @@ msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Message to Display"
+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 "Play sound:"
+msgid "Message to Display"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Repeat the alarm"
+msgid "Play sound:"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Run program:"
+msgid "Repeat the alarm"
 msgstr ""
 
 #: 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."
+msgid "Run program:"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
@@ -3752,110 +3813,110 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.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:391
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:401
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3876,7 +3937,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3958,7 +4019,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr ""
 
@@ -3971,7 +4032,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr ""
 
@@ -3980,7 +4041,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr ""
 
@@ -3993,7 +4054,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr ""
 
@@ -4011,7 +4072,7 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr ""
 
@@ -4028,7 +4089,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr ""
 
@@ -4037,7 +4098,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr ""
 
@@ -4255,8 +4316,8 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr ""
 
@@ -4325,27 +4386,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr ""
 
@@ -4414,19 +4475,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4466,7 +4527,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4478,7 +4539,7 @@ 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4551,44 +4612,44 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr ""
 
@@ -4680,7 +4741,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr ""
 
@@ -4689,7 +4750,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr ""
 
@@ -4701,17 +4762,17 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4781,12 +4842,12 @@ msgid "100%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
@@ -4795,30 +4856,30 @@ msgstr ""
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -4844,12 +4905,12 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4858,8 +4919,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr ""
 
@@ -4888,7 +4949,7 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr ""
@@ -4952,436 +5013,442 @@ msgstr ""
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, 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:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, 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:1612
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5426,7 +5493,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr ""
 
@@ -5439,52 +5506,52 @@ msgid "Resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr ""
 
@@ -5574,40 +5641,47 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, 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:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr ""
 
@@ -5621,7 +5695,13 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, c-format
+msgid "Adding alarms for %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5629,7 +5709,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5637,12 +5717,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising folder"
@@ -5703,47 +5783,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -5979,7 +6068,7 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr ""
@@ -6001,7 +6090,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6009,12 +6098,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr ""
 
@@ -6074,128 +6163,132 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
+#: calendar/pcs/query.c:1483
+msgid "Parse error"
+msgstr ""
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7780,79 +7873,79 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7897,11 +7990,11 @@ msgstr ""
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Can not open message"
@@ -8205,7 +8298,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8260,50 +8353,50 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8489,7 +8582,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8498,11 +8591,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8519,7 +8612,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8569,70 +8662,78 @@ msgstr "Can not rename folder: %s: Invalid operation"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:395
 #, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:405
+#, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8648,28 +8749,24 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8686,6 +8783,11 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Could not close temporary folder: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
@@ -8732,73 +8834,68 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8806,24 +8903,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -8896,8 +8993,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8909,7 +9006,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
@@ -8923,32 +9020,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -8968,6 +9065,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8977,12 +9075,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9006,7 +9106,8 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9034,7 +9135,7 @@ msgid "Storing folder"
 msgstr "Synchronising folder"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
@@ -9197,40 +9298,45 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Can not open MH directory path: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, c-format
+msgid "`%s' is not a mailbox file."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders can not be deleted"
 
@@ -9319,49 +9425,49 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr ""
 
@@ -9618,40 +9724,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9659,88 +9765,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9748,76 +9854,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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
-msgid "%u bytes"
+msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
-msgid "%.1fK"
+msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:115
+#: composer/e-msg-composer-attachment-bar.c:113
 #, c-format
-msgid "%.1fM"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+msgid "%.0fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -9849,7 +9946,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9860,45 +9957,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9907,11 +10004,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 msgid "Posting destination"
 msgstr ""
 
@@ -9925,113 +10022,130 @@ msgstr ""
 msgid "Could not create a PGP signature context"
 msgstr "Could not close temporary folder: %s"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 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:1530
+#: composer/e-msg-composer.c:1525
+#, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Cannot initialise Evolution's composer."
 
 #: data/evolution.desktop.in.h:1
@@ -10083,8 +10197,8 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10230,7 +10344,7 @@ msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+msgid "You must choose a date."
 msgstr ""
 
 #: filter/filter-datespec.c:269
@@ -10284,13 +10398,11 @@ msgid "Add action"
 msgstr ""
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
+msgid "You must specify a folder.\n"
 msgstr ""
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr ""
 
@@ -10301,7 +10413,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr ""
@@ -10472,213 +10584,217 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "is before"
+msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
+msgid "Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
+msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-msgid "Label"
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Message Header"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not return"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
+msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
-msgid "Sender"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:58
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
-msgid "Subject"
+#: filter/libfilter-i18n.h:60
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
 msgstr ""
 
 #: filter/rule-editor.c:180
@@ -10714,31 +10830,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr ""
 
@@ -10795,38 +10911,38 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronising folders"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10934,99 +11050,108 @@ msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:103
-msgid "Virtual Trash"
+msgid "Public Mail"
 msgstr ""
 
 #: mail/component-factory.c:103
+msgid "Public folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:104
+msgid "Virtual Trash"
+msgstr ""
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Can not open message"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Can not open message"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1067
+#: 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:1073
+#: 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:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -11071,129 +11196,129 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -11262,19 +11387,19 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11291,14 +11416,14 @@ msgid "Really delete account?"
 msgstr ""
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr ""
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr ""
 
@@ -11374,8 +11499,8 @@ msgstr ""
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
 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 ""
 
 #: mail/mail-callbacks.c:270
@@ -11409,77 +11534,77 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 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:1206
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11487,67 +11612,67 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 msgid " [script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 msgid "en"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 msgid "Add Signature"
 msgstr ""
 
@@ -11588,16 +11713,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12236,75 +12361,71 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr ""
 
@@ -12313,145 +12434,141 @@ msgstr ""
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, 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:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -12682,20 +12799,20 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr ""
 
@@ -12704,22 +12821,22 @@ msgstr ""
 msgid "Could not save signature file: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 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:371
-msgid "Type the name by which you would like to refer to this signature."
+#: mail/mail-signature-editor.c:372
+msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr ""
 
@@ -12755,7 +12872,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr ""
 
@@ -12785,67 +12902,67 @@ msgstr ""
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr ""
 
@@ -12914,45 +13031,67 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+msgid "C_ompleted"
+msgstr ""
+
+#: 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
+msgid "_Clear Flag"
+msgstr ""
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+msgid "_Flag:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising folders"
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr ""
 
@@ -22869,12 +23008,12 @@ msgstr ""
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr ""
 
@@ -22884,23 +23023,23 @@ msgstr ""
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -22937,11 +23076,11 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr ""
 
@@ -24264,6 +24403,11 @@ msgid ""
 "%s"
 msgstr "Can not get folder: %s: %s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr ""
@@ -24466,23 +24610,34 @@ msgid "Rename folder"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr "Can not get folder: %s: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, 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:288
 msgid "Create New Folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr ""
 
@@ -24507,120 +24662,110 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#. 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 ""
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -24646,31 +24791,31 @@ msgstr "Synchronising folder"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synchronising folder"
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising folder"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising folders"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, 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:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -24708,44 +24853,44 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr ""
 
@@ -24753,25 +24898,25 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24784,12 +24929,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24797,19 +24942,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr ""
 
@@ -24944,59 +25089,63 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Can not create folder lock on %s: %s"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25190,7 +25339,7 @@ msgstr ""
 #: shell/glade/evolution-startup-wizard.glade.h:15
 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. "
 msgstr ""
@@ -25204,26 +25353,22 @@ msgid "Evolution Import Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr ""
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr ""
 
-#: 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"
@@ -25429,10 +25574,10 @@ 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-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr ""
 
@@ -25550,7 +25695,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr ""
 
@@ -25577,7 +25722,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr ""
 
@@ -25659,8 +25804,9 @@ msgid "Schedule a meeting for this item"
 msgstr ""
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Can not initialise the Ximian Evolution shell."
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -25709,27 +25855,28 @@ msgid "Post a message to a Public folder"
 msgstr "Can not append message to maildir folder: %s: %s"
 
 #: ui/evolution-mail-global.xml.h:13
-msgid "Show message preview window"
-msgstr ""
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Synchronising folders"
 
 #: ui/evolution-mail-global.xml.h:14
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Show message preview window"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:15
-msgid "Virtual Folder _Editor..."
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
-msgid "_Filters..."
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:18
-msgid "_Preview Pane"
+msgid "_Filters..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
+msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:1
@@ -25825,7 +25972,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr ""
 
@@ -26123,7 +26270,7 @@ msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+msgid "Set up the page settings for your current printer"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26230,7 +26377,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr ""
 
@@ -26245,12 +26392,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:43
+#: 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:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr ""
 
@@ -26421,7 +26568,7 @@ msgstr ""
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr ""
 
@@ -26582,7 +26729,7 @@ msgid "Open Other _User's Folder..."
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -26598,110 +26745,126 @@ msgid "Pi_lot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Send / Receive"
+msgid "Pilot Con_duit Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:28
-msgid "Send queued items and retrieve new items"
+msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr ""
 
 #: ui/evolution.xml.h:29
-msgid "Set up Pilot configuration"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:30
-msgid "Show information about Ximian Evolution"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:31
-msgid "Submit Bug Report"
+msgid "Set up Pilot conduit configuration"
 msgstr ""
 
 #: ui/evolution.xml.h:32
-msgid "Submit _Bug Report"
+msgid "Set up Pilot configuration"
 msgstr ""
 
 #: ui/evolution.xml.h:33
-msgid "Submit a bug report using Bug Buddy"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:34
-msgid "Toggle"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:35
-msgid "Toggle whether to show the folder bar"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:36
-msgid "Toggle whether to show the shortcut bar"
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.xml.h:37
-msgid "Toggle whether we are working offline."
+msgid "Toggle"
 msgstr ""
 
 #: ui/evolution.xml.h:38
-msgid "View the selected folder"
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:39
+msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
 #: ui/evolution.xml.h:40
-msgid "Ximian Evolution _FAQ"
+msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ui/evolution.xml.h:41
-msgid "_About Ximian Evolution..."
+msgid "View the selected folder"
+msgstr ""
+
+#: ui/evolution.xml.h:43
+msgid "Ximian Evolution _FAQ"
 msgstr ""
 
 #: ui/evolution.xml.h:44
+msgid "_About Ximian Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
+#: ui/evolution.xml.h:59
+msgid "_Remove Other User's Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+msgid "_Settings..."
+msgstr ""
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr ""
 
@@ -26928,11 +27091,11 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 08ff5403b4..09e9211f68 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -320,11 +320,16 @@ msgstr ""
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+msgid "Unnamed List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -335,47 +340,47 @@ msgstr ""
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Synchronise \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr ""
 
@@ -392,13 +397,13 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr ""
@@ -468,10 +473,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr ""
@@ -488,27 +493,36 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:77
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact list"
 msgstr ""
 
@@ -545,7 +559,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: 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"
@@ -555,24 +569,24 @@ msgstr "Could not initialise Bonobo"
 msgid "Other Contacts"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 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:487
+#: addressbook/gui/component/addressbook.c:490
 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:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -580,43 +594,53 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 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:613
-#: addressbook/gui/component/addressbook.c:616
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
 #, c-format
-msgid "Enter password for %s (user %s)"
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -624,7 +648,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -632,25 +656,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -716,47 +740,47 @@ msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
+msgid "1234"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:13
@@ -887,47 +911,53 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -938,7 +968,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -947,45 +977,45 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -993,7 +1023,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1002,7 +1032,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1010,7 +1040,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1020,7 +1050,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1030,34 +1060,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1065,11 +1095,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1078,24 +1108,24 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1103,44 +1133,44 @@ msgstr ""
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1150,93 +1180,93 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_More Options >>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "searching-tab"
 msgstr ""
 
@@ -1250,8 +1280,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1282,11 +1312,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 msgid "Find contact in"
 msgstr ""
 
@@ -1357,7 +1387,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr ""
 
@@ -1415,13 +1445,13 @@ msgstr ""
 
 #: 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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr ""
 
@@ -1449,1027 +1479,1027 @@ msgstr ""
 msgid "_Web page address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 #, fuzzy
 msgid "Argentina"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Benin"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "Colours"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #, fuzzy
 msgid "Comoros"
 msgstr "Colours"
 
-#: 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
 msgid "Congo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr ""
 
@@ -2504,20 +2534,20 @@ msgstr ""
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr ""
 
@@ -2537,6 +2567,18 @@ msgid ""
 "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
+msgid "Overwrite"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
@@ -2667,7 +2709,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2713,7 +2755,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr ""
 
@@ -2722,24 +2764,24 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2751,10 +2793,10 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr ""
 
@@ -2762,7 +2804,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2783,8 +2825,8 @@ msgstr ""
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr ""
 
@@ -2832,7 +2874,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr ""
 
@@ -2849,9 +2891,8 @@ msgstr "Synchronising \"%s\""
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -2937,7 +2978,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -3016,7 +3057,7 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3024,8 +3065,8 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 msgid "Current View"
 msgstr ""
 
@@ -3033,7 +3074,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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 ""
 
@@ -3041,11 +3082,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3169,7 +3210,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr ""
 
@@ -3194,7 +3235,7 @@ msgid "Options"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 #, fuzzy
 msgid "Orientation"
 msgstr "Organisation"
@@ -3218,7 +3259,7 @@ msgstr ""
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr ""
 
@@ -3280,20 +3321,20 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr ""
 
@@ -3304,13 +3345,17 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3426,11 +3471,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3438,13 +3483,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3455,16 +3500,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3514,7 +3559,7 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3588,9 +3633,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3607,13 +3652,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr ""
 
@@ -3633,74 +3678,91 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Colours"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 msgid "Create a new all-day appointment"
 msgstr ""
 
@@ -3742,25 +3804,25 @@ msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Message to Display"
+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 "Play sound:"
+msgid "Message to Display"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Repeat the alarm"
+msgid "Play sound:"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Run program:"
+msgid "Repeat the alarm"
 msgstr ""
 
 #: 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."
+msgid "Run program:"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
@@ -3786,110 +3848,110 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.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:391
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:401
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3910,7 +3972,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3993,7 +4055,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr ""
 
@@ -4006,7 +4068,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr ""
 
@@ -4015,7 +4077,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr ""
 
@@ -4028,7 +4090,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr ""
 
@@ -4046,7 +4108,7 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr ""
 
@@ -4063,7 +4125,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr ""
 
@@ -4072,7 +4134,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr ""
 
@@ -4290,8 +4352,8 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr ""
 
@@ -4360,27 +4422,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr ""
 
@@ -4449,19 +4511,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4501,7 +4563,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4513,7 +4575,7 @@ 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4588,44 +4650,44 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr ""
 
@@ -4717,7 +4779,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr ""
 
@@ -4726,7 +4788,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr ""
 
@@ -4738,17 +4800,17 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4818,12 +4880,12 @@ msgid "100%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
@@ -4832,30 +4894,30 @@ msgstr ""
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -4881,12 +4943,12 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4895,8 +4957,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr ""
 
@@ -4925,7 +4987,7 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr ""
@@ -4989,437 +5051,443 @@ msgstr ""
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -5465,7 +5533,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr ""
 
@@ -5478,52 +5546,52 @@ msgid "Resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr ""
 
@@ -5613,40 +5681,47 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr ""
 
@@ -5660,7 +5735,13 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5668,7 +5749,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5676,12 +5757,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising \"%s\""
@@ -5742,47 +5823,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6019,7 +6109,7 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr ""
@@ -6041,7 +6131,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6049,12 +6139,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr ""
 
@@ -6115,128 +6205,132 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
+#: calendar/pcs/query.c:1483
+msgid "Parse error"
+msgstr ""
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7821,81 +7915,81 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7938,11 +8032,11 @@ msgstr ""
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr ""
 
@@ -8244,7 +8338,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8299,51 +8393,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8529,7 +8623,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8538,11 +8632,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8559,7 +8653,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8608,68 +8702,76 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:395
 #, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:405
+#, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8683,28 +8785,24 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8721,6 +8819,11 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
@@ -8767,73 +8870,68 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8841,24 +8939,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -8931,8 +9029,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8944,7 +9042,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
@@ -8958,32 +9056,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9003,6 +9101,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9012,12 +9111,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9041,7 +9142,8 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9070,7 +9172,7 @@ msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
@@ -9231,40 +9333,45 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, c-format
+msgid "`%s' is not a mailbox file."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -9353,47 +9460,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr ""
 
@@ -9650,40 +9757,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9691,87 +9798,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9779,76 +9886,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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
-msgid "%.1fK"
+msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:115
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
-msgid "%.1fM"
+msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:119
+#: composer/e-msg-composer-attachment-bar.c:113
 #, c-format
-msgid "%.1fG"
+msgid "%.0fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -9880,7 +9978,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9891,45 +9989,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9938,11 +10036,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 msgid "Posting destination"
 msgstr ""
 
@@ -9956,114 +10054,130 @@ msgstr ""
 msgid "Could not create a PGP signature context"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 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:1530
+#: composer/e-msg-composer.c:1525
+#, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
+#: composer/evolution-composer.c:408
 #, fuzzy
-msgid "Cannot initialize Evolution's composer."
+msgid "Cannot initialize the Evolution composer."
 msgstr "Cannot initialise Evolution's mail component."
 
 #: data/evolution.desktop.in.h:1
@@ -10115,8 +10229,8 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10270,8 +10384,9 @@ msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
-msgstr ""
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Synchronising \"%s\""
 
 #: filter/filter-datespec.c:269
 msgid "<click here to select a date>"
@@ -10324,13 +10439,12 @@ msgid "Add action"
 msgstr ""
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Synchronising \"%s\""
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr ""
 
@@ -10341,7 +10455,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr ""
@@ -10512,214 +10626,218 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "is before"
+msgid "Run Once"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
+msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-msgid "Label"
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Message Header"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not return"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
+msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
-msgid "Sender"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:58
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
-msgid "Subject"
+#: filter/libfilter-i18n.h:60
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
 msgstr ""
 
 #: filter/rule-editor.c:180
@@ -10756,31 +10874,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr ""
 
@@ -10837,39 +10955,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronise \"%s\""
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10986,100 +11104,109 @@ msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:103
-msgid "Virtual Trash"
+msgid "Public Mail"
 msgstr ""
 
 #: mail/component-factory.c:103
+msgid "Public folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:104
+msgid "Virtual Trash"
+msgstr ""
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 msgid "Warning: Unsent Messages"
 msgstr ""
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Colours"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 msgid "Post a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1067
+#: 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:1073
+#: 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:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -11124,130 +11251,130 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -11318,19 +11445,19 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11347,14 +11474,14 @@ msgid "Really delete account?"
 msgstr ""
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr ""
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr ""
 
@@ -11430,8 +11557,8 @@ msgstr ""
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
 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 ""
 
 #: mail/mail-callbacks.c:270
@@ -11465,77 +11592,77 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 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:1206
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11543,68 +11670,68 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 msgid " [script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Organisation"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 msgid "Add Signature"
 msgstr ""
 
@@ -11645,16 +11772,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12296,75 +12423,71 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr ""
 
@@ -12373,146 +12496,142 @@ msgstr ""
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, 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:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -12745,20 +12864,20 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr ""
 
@@ -12767,22 +12886,22 @@ msgstr ""
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 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:371
-msgid "Type the name by which you would like to refer to this signature."
+#: mail/mail-signature-editor.c:372
+msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr ""
 
@@ -12818,7 +12937,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr ""
 
@@ -12850,67 +12969,67 @@ msgstr ""
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr ""
 
@@ -12979,45 +13098,68 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+msgid "C_ompleted"
+msgstr ""
+
+#: 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 "Colours"
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+msgid "_Flag:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising \"%s\""
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr ""
 
@@ -22971,12 +23113,12 @@ msgstr ""
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr ""
 
@@ -22986,23 +23128,23 @@ msgstr ""
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -23039,11 +23181,11 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr ""
 
@@ -24370,6 +24512,11 @@ msgid ""
 "%s"
 msgstr "Synchronising \"%s\""
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -24580,24 +24727,35 @@ msgid "Rename folder"
 msgstr "Synchronising \"%s\""
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, 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:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr ""
 
@@ -24622,123 +24780,113 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#. 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 ""
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -24764,32 +24912,32 @@ msgstr "Synchronising \"%s\""
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -24827,44 +24975,44 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr ""
 
@@ -24872,25 +25020,25 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24903,12 +25051,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24916,19 +25064,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr ""
 
@@ -25063,59 +25211,63 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Synchronising \"%s\""
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25312,7 +25464,7 @@ msgstr ""
 #: shell/glade/evolution-startup-wizard.glade.h:15
 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. "
 msgstr ""
@@ -25326,26 +25478,22 @@ msgid "Evolution Import Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr ""
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr ""
 
-#: 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"
@@ -25553,10 +25701,10 @@ 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-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr ""
 
@@ -25675,7 +25823,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr ""
 
@@ -25702,7 +25850,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr ""
 
@@ -25784,8 +25932,9 @@ msgid "Schedule a meeting for this item"
 msgstr ""
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -25832,27 +25981,28 @@ msgid "Post a message to a Public folder"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:13
-msgid "Show message preview window"
-msgstr ""
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Synchronising \"%s\""
 
 #: ui/evolution-mail-global.xml.h:14
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Show message preview window"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:15
-msgid "Virtual Folder _Editor..."
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
-msgid "_Filters..."
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:18
-msgid "_Preview Pane"
+msgid "_Filters..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
+msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:1
@@ -25948,7 +26098,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr ""
 
@@ -26245,7 +26395,7 @@ msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+msgid "Set up the page settings for your current printer"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26352,7 +26502,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr ""
 
@@ -26367,13 +26517,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:43
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr ""
 
@@ -26545,7 +26695,7 @@ msgstr ""
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr ""
 
@@ -26708,7 +26858,7 @@ msgid "Open Other _User's Folder..."
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -26725,112 +26875,130 @@ 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
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+msgid "Set up Pilot conduit configuration"
+msgstr ""
+
+#: ui/evolution.xml.h:32
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
+#: ui/evolution.xml.h:59
+msgid "_Remove Other User's Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Cannot initialise the Evolution shell."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 msgid "_Shortcut..."
 msgstr ""
 
@@ -27059,11 +27227,11 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index be569f005a..8d30f38eb9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-07-30 13:47+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -330,11 +330,17 @@ msgstr "Apellido"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Lista de contactos sin nombre"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "VCards m�ltiples"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -345,47 +351,47 @@ msgstr "VCard para %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "A�adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la b�squeda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error eliminando tarjeta"
@@ -404,13 +410,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
@@ -477,10 +483,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factor�a para el control de ejemplo de la Agenda"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contactos"
@@ -497,28 +503,38 @@ msgstr "Servidor LDAP"
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "La carpeta contiene informaci�n de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crear nueva lista de contactos"
@@ -567,7 +583,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "No se puede inicializar gnome-vfs"
 
@@ -575,11 +591,11 @@ msgstr "No se puede inicializar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -587,7 +603,7 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -598,7 +614,7 @@ msgstr ""
 "que ha introducido una URI err�nea, o que el servidor LDAP est�\n"
 "ca�do"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -610,7 +626,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -621,38 +637,51 @@ msgstr ""
 "que ha introducido una URI err�nea, o que el servidor LDAP est�\n"
 "ca�do"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"No pude autenticarme en el servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Introduzca la contrase�a para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "finaliza con"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "finaliza con"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categor�a es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -660,7 +689,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -668,25 +697,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Cualquier categor�a"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrar� el visor de carpetas"
 
@@ -754,51 +783,53 @@ msgid "  S_how Supported Bases "
 msgstr "Mo_strar bases soportadas "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "<< Menos Opciones"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "<- _Quitar"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "<< Menos Opciones"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -937,52 +968,58 @@ msgstr "Uno"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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 "Predeterminados"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Predeterminados"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Rango de b�_squeda: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Buscando"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar todo"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Borrado"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -993,7 +1030,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1002,47 +1039,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informaci�n de la Fuente"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectando al servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schema no soportado"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1050,7 +1087,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1059,7 +1096,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1067,7 +1104,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1077,7 +1114,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1087,13 +1124,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1103,7 +1140,7 @@ msgstr ""
 "Este es el m�ximo n�mero de tarjetas a descargar.  Si pone este n�mero "
 "demasiado alto relentizar� su agenda."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1113,7 +1150,7 @@ msgstr ""
 "configurarlo como \"Direcci�n de Correo\" requiere acceso an�nimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1123,7 +1160,7 @@ msgstr ""
 "Este nombre ser� usado para identificar su cuenta, Es solo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1131,11 +1168,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1144,26 +1181,26 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using email address"
 msgstr "Usando direcci�n de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1171,52 +1208,52 @@ msgstr ""
 msgid "_Add"
 msgstr "_A�adir"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
-msgstr "_A�adir ->"
+msgid "_Add ->"
+msgstr "_A�adir"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "A�adir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "A�adir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Borrar todo"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Display name:"
 msgstr "_Mostrar nombre:"
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr "L�mite de _descarga:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1226,99 +1263,99 @@ msgstr "L�mite de _descarga:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editar cita"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Evolution attribute:"
 msgstr "Atributo de _Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Opciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Predeterminados"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Base de _b�squeda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tiempo de recordatorio (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "account-druid"
 msgstr "ayudante-de-cuentas"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-editor"
 msgstr "editor-de-cuentas"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconectar a %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscando"
@@ -1335,8 +1372,8 @@ msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1367,11 +1404,11 @@ msgstr "(%d no mostrado)"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "El remitente contiene"
@@ -1444,7 +1481,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Detalles"
 
@@ -1504,13 +1541,13 @@ msgstr "Prefiere recibir el correo como _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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1538,1026 +1575,1026 @@ msgstr "URL del calendario _p�blico:"
 msgid "_Web page address:"
 msgstr "Direcci�n de la p�gina _web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Argelia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Ant�rtico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua y Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: 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:141
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbayan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "B�lgica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia y Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Isla Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Territorios brit�nicos en el oc�ano �ndico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Camboya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Camer�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Islas Caim�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Rep�blica Central Africana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Isla Navidad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Isla Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Comoros"
 
-#: 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
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Islas Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croacia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Rep�blica Checa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Rep�blica Dominicana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiop�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Islas Malvinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Islas Feroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guinea Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Territorios Sur Franceses"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gab�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Granada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Hait�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Heard And McDonald Islands"
 msgstr "Islas Heard y McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungr�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Jap�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazajist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Rep�blica Coreana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "L�bano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Macai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "M�xico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Rep�blica Coreana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "M�naco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marruecos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nueva Zelanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "N�ger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Islas Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "Islas al Noreste de Mariana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noruega"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Om�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Territorios palestinos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panam�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Nueva Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Per�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reuni�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Ruman�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Federaci�n Rusa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Sant Kitts y Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Sant Vincente y The Grena-dines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "Santo Tom� y Pr�ncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saud�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Islas Salom�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sud�frica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgia del Sur y las Islas Sandwich Meridionales"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espa�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre y Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sud�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surin�m"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Islas Svalbard y Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania; Rep�blica Unida de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tailanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad y Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "T�nez"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turqu�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Islas Turks y Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucrania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "Islas V�rgenes, Brit�nicas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "Islas V�rgenes, U.S."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Islas Wallis y Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbiabue"
 
@@ -2594,20 +2631,20 @@ msgstr "TTY/TDD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "No pude encontrar el widget para el campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "A�adir Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Editar Todo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "Correo electr�nico"
 
@@ -2629,6 +2666,19 @@ msgstr ""
 "%s ya existe\n"
 "�Quiere sobreescribirlo?"
 
+#: 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "�Sobreescribir archivo?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Direcci�n _2:"
@@ -2759,7 +2809,7 @@ msgstr "editor-de-listas-de-contactos"
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2809,7 +2859,7 @@ msgstr ""
 "ya existen en esta carpeta.  �Quiere a�adirlo de todos modos?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "B�squeda avanzada"
 
@@ -2822,25 +2872,25 @@ msgstr "B�squeda avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Sin tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2852,10 +2902,10 @@ msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2863,7 +2913,7 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permiso denegado"
@@ -2884,8 +2934,8 @@ msgstr "Protocolo no implementado"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2934,7 +2984,7 @@ msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
@@ -2955,9 +3005,8 @@ msgstr "Mostrar"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3043,7 +3092,7 @@ msgstr "Agenda de direcciones"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
@@ -3130,7 +3179,7 @@ msgstr "Pegar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3138,8 +3187,8 @@ msgstr "Pegar"
 msgid "Delete"
 msgstr "Suprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista actual"
@@ -3148,7 +3197,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3156,11 +3205,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3294,7 +3343,7 @@ msgid "Include:"
 msgstr "Incluye:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -3319,7 +3368,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientaci�n"
 
@@ -3342,7 +3391,7 @@ msgstr "Fuente del papel:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3408,20 +3457,20 @@ msgstr "Cita sin t�tulo"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Baja"
 
@@ -3432,13 +3481,17 @@ msgstr "Baja"
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de calendario del pilot"
 
@@ -3548,11 +3601,11 @@ msgstr "Tiempo de recordatorio (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "No hay descripci�n disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3564,13 +3617,13 @@ msgstr ""
 "configurado para enviar un mensaje de correo.  En su lugar\n"
 "Evolution mostrar� un di�logo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3587,15 +3640,15 @@ msgstr ""
 "\n"
 "�Est� seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "No se puede inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factor�a del servicio de la alarma de notificaci�n"
 
@@ -3644,7 +3697,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
@@ -3721,9 +3774,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3740,13 +3793,13 @@ msgid "Assigned"
 msgstr "Asignado"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Si"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "No"
 
@@ -3766,76 +3819,96 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL del calendario _p�blico:"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Carpeta conteniendo citas y 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimir tarjetas"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Carpeta que contiene elementos por hacer"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Reuni�n"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Cita de todo el _d�a"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear una nueva cita"
@@ -3879,30 +3952,31 @@ msgid "Alarm Repeat"
 msgstr "Repetici�n de Alarmas"
 
 #: 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 ""
+"Este es un recordatorio por correo, pero Evolution todav�a no implementa "
+"esta clase de recordatorios.  No podr� editar las opciones de este "
+"recordatorio."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensajes a Mostrar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Tocar un sonido:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Repetir la alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Ejecutar programa:"
 
-#: 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 ""
-"Este es un recordatorio por correo, pero Evolution todav�a no implementa "
-"esta clase de recordatorios.  No podr� editar las opciones de este "
-"recordatorio."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
@@ -3926,110 +4000,110 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d d�as"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 d�a"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Acci�n a realizar desconocida"
 
-#: 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 antes de comenzar la cita"
 
-#: 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 tras el comienzo de la cita"
 
-#: 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 al comienzo de la cita"
 
-#: 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 antes de terminar a cita"
 
-#: 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 tras finalizar la cita"
 
-#: 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 al finalizar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: 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 para un tipo de disparador desconocido"
@@ -4050,7 +4124,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4132,7 +4206,7 @@ msgid "Days"
 msgstr "D�as"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4145,7 +4219,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4155,7 +4229,7 @@ msgid "S_un"
 msgstr "Do_m"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -4168,7 +4242,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _n�meros de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4186,7 +4260,7 @@ msgid "Task List"
 msgstr "Lista de Tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4203,7 +4277,7 @@ msgid "Time format:"
 msgstr "Formato del tiempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4212,7 +4286,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
@@ -4437,8 +4511,8 @@ msgid "No summary"
 msgstr "Sin resumen"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Guardar como..."
 
@@ -4507,27 +4581,27 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Repetici�n"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Planificaci�n"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Reuni�n"
 
@@ -4596,19 +4670,19 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "�Esa persona ya est� participando en la reuni�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -4648,7 +4722,7 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4662,7 +4736,7 @@ msgstr "Papel"
 # libnautilus-private/nautilus-program-chooser.c:1199
 #: 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4739,46 +4813,46 @@ msgstr "�"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1560
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr "�ltimo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Otro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -4872,7 +4946,7 @@ msgstr "Fecha 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Necesita acci�n"
 
@@ -4881,7 +4955,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4895,17 +4969,17 @@ msgstr "E_stado:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1031
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "B�sico"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4975,14 +5049,14 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
@@ -4991,30 +5065,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5043,12 +5117,12 @@ msgstr "_Marcar tareas como completas"
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para a�adir una tarea"
@@ -5057,8 +5131,8 @@ msgstr "Pulse para a�adir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Completo"
 
@@ -5087,7 +5161,7 @@ msgid "Start Date"
 msgstr "Fecha de Inicio"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Resumen"
@@ -5154,122 +5228,122 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la informaci�n de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr "_Configurar..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configurar"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Concertar un _encuentro"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Las utilidades GNOME Pilot no aparecen instaladas en este sistema."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Termina: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completado "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "Informaci�n del calendario"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Error de calendario"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5277,335 +5351,341 @@ msgstr ""
 "<br> Por favor revise la siguiente informaci�n, y seleccione una acci�n del "
 "men� de abajo."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "L_ocalizaci�n:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Rechazado"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Elija una acci�n:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaci�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Enviar �ltima informaci�n"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado informaci�n de reuniones."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informaci�n  de reuniones"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Propuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la �ltima actualizaci�n de la reuni�n."
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Petici�n de actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Respuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reuni�n err�neo"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, 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:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> te pide que realices una tarea."
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea a�adir a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Petici�n de actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea err�neo"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Petici�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad err�neo"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un calendario de mensaje v�lido"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Lo siento, pero hubo un error al leer %s."
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "�El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "No puedo abrir la carpeta en `%s'"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "�El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta"
@@ -5651,7 +5731,7 @@ msgstr "fecha de inicio"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -5665,52 +5745,52 @@ msgid "Resources"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Habitaci�n"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Silla"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5800,42 +5880,49 @@ msgstr "Hora de _inicio de la reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reuni�n:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tarea en %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�todo necesario para cargar `%s' no est� implementado"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Error cargando %s"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
@@ -5849,7 +5936,13 @@ msgstr "No puedo abrir la carpeta en `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no est� implementado"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarmas en %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5857,7 +5950,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5865,12 +5958,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abriendo carpeta %s"
@@ -5931,48 +6024,57 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Es necesario por lo menos un asistente"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Es necesario por lo menos un asistente"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Informaci�n del evento"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informaci�n de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Informaci�n del calendario"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Regenerar la lista"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Informaci�n de disponibilidad (de %s a %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "Informaci�n de iCalendar"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
@@ -6208,7 +6310,7 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Vista previa"
@@ -6231,7 +6333,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� la carpeta de tareas"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6244,12 +6346,12 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarjetas"
@@ -6323,16 +6425,16 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "No puedo conectar con el almac�n: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6341,96 +6443,96 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "�Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Agenda"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que el argumento 2 sea un entero"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 2 sea time_t"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains? espera que el argumento 1 sea �any�, �summary� � �description�"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6438,23 +6540,28 @@ msgstr ""
 "has-categories? espera que todos los argumentos sean cadenas o que uno y "
 "solo un argumento sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "�esta completo? espera 0 argumentos"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before espera 1 argumentos"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La evaluaci�n de la expresi�n de b�squeda no ha devuelto un valor booleano"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Otro error"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8045,82 +8152,82 @@ msgstr "Guardando carpeta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos inv�lidos"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inv�lidos"
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
@@ -8167,11 +8274,11 @@ msgstr "Operaci�n no implementada: b�squeda seg�n la expresi�n %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operaci�n no implementada: b�squeda por uids: para %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
@@ -8492,7 +8599,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
@@ -8548,52 +8655,52 @@ msgstr "Autenticaci�n POP antes de SMTP usando una fuente no POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fall� la compilaci�n de la expresi�n regular: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL '%s' necesita un componente de usuario"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL '%s' necesita un componente de servidor"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
@@ -8792,7 +8899,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8801,11 +8908,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr "BAD"
 
@@ -8827,7 +8934,7 @@ msgstr ""
 "�Quieres aceptarlo de todos modos?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8882,68 +8989,76 @@ msgstr "No puedo renombrar la carpeta: %s: Operaci�n no v�lida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconect� inesperadamente: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Respuesta inesperada del servidor IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor termin� demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Error al decodificar el mensaje."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8959,28 +9074,24 @@ msgstr ""
 "No puedo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informaci�n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Buscando mensajes nuevos"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -8997,6 +9108,11 @@ msgstr "No puedo abrir directorio de cache: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Error al cachear el mensaje %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
@@ -9044,78 +9160,73 @@ msgstr "Contrase�a"
 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:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci�n no implementada"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Fallo en la autenticaci�n."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Esta carpeta no est� vac�a"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticaci�n %s no est� implementado"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9126,25 +9237,25 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "El nombre de la carpeta no puede contener el car�cter de retorno de carro."
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
@@ -9220,8 +9331,8 @@ msgid ""
 msgstr "Para leer y guardar el correo local en directorios est�ndar mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La direcci�n %s no es absoluta"
@@ -9233,7 +9344,7 @@ msgstr "%s no es 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:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No pude acceder a la carpeta: %s: %s"
@@ -9247,32 +9358,32 @@ msgstr "Los almacenes locales no tienen una carpeta de entrada"
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No pude borrar el resumen la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el �ndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No puedo guardar el resumen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude a�adir mensajes al resumen: raz�n desconocida"
 
@@ -9293,6 +9404,7 @@ msgstr "Contenido inv�lido en el mensaje"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9304,12 +9416,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
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9335,7 +9449,8 @@ msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%s': %s"
@@ -9363,7 +9478,7 @@ msgid "Storing folder"
 msgstr "Guardando carpeta"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No puedo crear un bloqueo de carpetas en %s: %s"
@@ -9533,40 +9648,45 @@ msgstr "`%s' no es un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' no es un archivo normal."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
@@ -9659,47 +9779,47 @@ msgstr "Usar cancelar"
 msgid "Operation failed: %s"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr "Usuario cancelado"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaciones indeterminadas"
@@ -9975,46 +10095,46 @@ msgstr "Fallo temporal en la autenticaci�n"
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Parece que el mensaje no est� bien construido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "El servidor SMTP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10025,90 +10145,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Env�o de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no v�lida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Error en la petici�n de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para DATA: %s: correo no enviado"
@@ -10116,82 +10236,73 @@ msgstr "Expir� el tiempo para DATA: %s: correo no 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -10223,7 +10334,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos autom�ticamente"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Presione aqu� para acceder a la agenda"
 
@@ -10234,7 +10345,7 @@ msgstr "Presione aqu� para acceder a la agenda"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Responder a:"
 
@@ -10243,40 +10354,40 @@ msgstr "Responder a:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibir�n una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10287,12 +10398,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Sin descripci�n"
@@ -10307,7 +10418,7 @@ msgstr "Adjuntar un archivo"
 msgid "Could not create a PGP signature context"
 msgstr "No pude crear un contexto de firma PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10316,34 +10427,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10352,7 +10463,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10361,7 +10472,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10370,7 +10481,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10378,27 +10489,38 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesi�n previa.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Este mensaje no ha sido enviado.\n"
+"\n"
+"�Quiere guardar los cambios?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10406,7 +10528,18 @@ msgstr ""
 "No puedo crear una ventana de composici�n:\n"
 "No puedo activar el control de selecci�n de direcciones."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"No pude crear una ventana de composici�n:\n"
+"No puedo activar el componente del editor HTML."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10414,13 +10547,13 @@ msgstr ""
 "No pude crear una ventana de composici�n:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10428,8 +10561,9 @@ msgstr ""
 "No pude crear una ventana de composici�n, porque no ha configurado\n"
 "todav�a ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10480,8 +10614,8 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10629,7 +10763,8 @@ msgid "years"
 msgstr "a�os"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Se ha olvidado de elegir una fecha."
 
 #: filter/filter-datespec.c:269
@@ -10684,15 +10819,12 @@ msgid "Add action"
 msgstr "A�adir acci�n"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Se ha olvidado de elegir una carpeta.\n"
-"Vuelva y especifique una carpeta v�lida donde entregar el correo."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Nombre del estilo:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -10705,7 +10837,7 @@ msgstr ""
 "Error en la expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Importante"
@@ -10891,226 +11023,230 @@ msgid "Beep"
 msgstr "Pitar"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "estaba despu�s de"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "estaba antes de"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcado"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcado"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Ejecutar comando de shell"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Le�do"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "es menor que"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 msgid "Shell Command"
 msgstr "Comando de shell"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Tama�o (Kb)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Sin estado"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "no contiene"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcado"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "estaba despu�s de"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "estaba antes de"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcado"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "comienza por"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reglas"
@@ -11144,31 +11280,31 @@ msgstr "Debes especificar al menos una carpeta como fuente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando su antiguo correo de Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Por favor espere"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s como %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Guardando %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Correo"
 
@@ -11229,39 +11365,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando su vieja informaci�n de Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Papelera"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Archivo de correo local %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Configuraci�n"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar filtros"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11378,26 +11514,36 @@ msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "P�blico"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Carpeta conteniendo correo"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papeleras virtuales"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11405,79 +11551,80 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 msgid "Warning: Unsent Messages"
 msgstr "Aviso: Mensajes no enviados"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Nuevo mensaje"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Siguiente mensaje"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Mensaje previo"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nuevo mensaje"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "No puedo inicializar el componente de configuraci�n de correo de Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "No puedo inicializar el componente de informaci�n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para �%s�"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
@@ -11522,138 +11669,138 @@ msgstr "%d enviar"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "Li_mpiar marca"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "A�adir Remitente a la Agen_da"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "Apl_icar filtros"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
@@ -11729,19 +11876,19 @@ msgstr "No ha rellenado toda la informaci�n requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
@@ -11758,14 +11905,14 @@ msgid "Really delete account?"
 msgstr "�Realmente quiere borrar realmente la cuenta?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Inhabilitar"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -11853,9 +12000,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "Estas enviando un mensaje formateado en HTML, pero los siguientes "
 "destinatarios no indica que quieran recibir mensajes formateados en HTML:\n"
@@ -11899,7 +12047,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11907,28 +12055,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribi�:"
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11936,7 +12084,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11944,39 +12092,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Esta seguro que quiere reenviar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11988,7 +12136,7 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11997,61 +12145,61 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 msgid " [script]"
 msgstr " [script]"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Enviado"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 msgid "Add script signature"
 msgstr "A�adir script de firma"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 msgid "Add Signature"
 msgstr "A�adir firma"
 
@@ -12111,16 +12259,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, c-format
 msgid "Account %d"
 msgstr "Cuenta %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -12817,78 +12965,74 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaci�n S/MIME."
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (v�a %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Cargar _Im�genes"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
@@ -12897,109 +13041,110 @@ msgstr "Guardar imagen como..."
 msgid "Pinging %s"
 msgstr "Guardando %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "Correo"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Este mensaje est� firmado digitalmente. Pulsa en el icono del candado para "
 "m�s informaci�n."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No pude crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en �%s�"
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetas locales"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13008,27 +13153,22 @@ msgstr ""
 "No puedo guardar la meta informaci�n de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No puedo guardar la meta informaci�n de la carpeta en %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "No puedo borrar la meta informaci�n de la carpeta %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13036,15 +13176,15 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "No puede cambiar el formato de una carpeta no local."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "No puede cambiar el formato de una carpeta no local."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13287,21 +13427,21 @@ msgstr "Esperando..."
 msgid "User canceled operation."
 msgstr "Operaci�n cancelada por el usuario."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Recuerda esta contrase�a"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Recordar esta clave durante el resto de esta sesi�n"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contrase�a para %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Introduzca contrase�a"
 
@@ -13310,11 +13450,11 @@ msgstr "Introduzca contrase�a"
 msgid "Could not save signature file: %s"
 msgstr "No pude guardar el archivo de firma."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13324,11 +13464,12 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "Firma en _HTML:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -13368,7 +13509,7 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -13398,67 +13539,67 @@ msgstr "(Sin asunto)"
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples mensajes sin leer"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "M�ltiples mensajes"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "La m�s baja"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "M�s baja"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "M�s alta"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "La m�s alta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13543,46 +13684,72 @@ msgstr "Re: Todos"
 msgid "Review"
 msgstr "Previsualizaci�n"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Nombre completo..."
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Completado"
+
+#: 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 "Li_mpiar marca"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Falta "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nombre de archivo:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizando carpetas bajo %s en �%s�"
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizando carpetas de nivel superior en �%s�"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta �%s�"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta �%s�"
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Guardar en carpeta..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ning�n servidor"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -23495,12 +23662,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Sin descripci�n"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
@@ -23510,23 +23677,23 @@ msgstr "Carpetas locales"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "LEMD:LEVS:LEVC"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere a�adir"
 
@@ -23564,12 +23731,12 @@ msgstr "(Sin descripci�n)"
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Lo siento, pero hubo un error al leer %s."
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Tiempo"
 
@@ -24896,6 +25063,11 @@ msgstr ""
 "No puedo transferir la carpeta:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Abrir en %s..."
+
 #: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr "A�adir una carpeta"
@@ -25138,12 +25310,25 @@ msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nombre de carpeta especificado no es valido: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"No puedo renombrar la carpeta:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25152,12 +25337,12 @@ msgstr ""
 "No puedo crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crear una _Nueva Carpeta..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -25186,20 +25371,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor seleccione la informaci�n que quieras importar:"
 
-#. 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 ""
-"Importando %s\n"
-"El importador no esta listo.\n"
-"Esperando 5 segundos antes de reintentar."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25208,22 +25380,22 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25232,11 +25404,11 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse de\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25245,17 +25417,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25264,31 +25436,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Importa datos y configuraci�n de programas antiguos"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Importar un �nico archivo"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25296,24 +25468,24 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
@@ -25340,32 +25512,32 @@ msgstr "Sincronizando carpeta"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abriendo carpeta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abriendo carpeta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Abrir en %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25408,44 +25580,44 @@ msgstr "El nombre de la carpeta no puede contener barras (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -25453,27 +25625,27 @@ msgstr "Trabajar desconectado"
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 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:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25492,12 +25664,12 @@ msgstr ""
 "El error del sistema de activaci�n es:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25508,19 +25680,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:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "No se encontr� la base de datos de configuraci�n"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Error gen�rico"
 
@@ -25662,58 +25834,62 @@ msgstr "Atajos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de archivo especificado no es v�lido"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Esta carpeta no est� vac�a"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "No se encontr� la carpeta especificada"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funci�n sin implementar en este manejador"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operaci�n no implementada"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no est� implementado por este manejador"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "No puedo mover una carpeta dentro de uno de sus descendientes"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "No puedo crear una carpeta con ese nombre"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25924,9 +26100,10 @@ msgstr ""
 "Por favor pulsa el bot�n �Siguiente� para continuar. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -25944,26 +26121,22 @@ msgid "Evolution Import Assistant"
 msgstr "Asistente de importaci�n de Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Asistente de importaci�n de Evolution"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Importar archivo (Paso 3 de 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Tipo de importador (Paso 1 de 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Seleccione imortador (paso 2 de 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Elija un archivo (paso 2 de 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"
@@ -26186,10 +26359,10 @@ msgstr "la fecha actual"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "A_cciones"
 
@@ -26309,7 +26482,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Guardar"
 
@@ -26338,7 +26511,7 @@ msgstr "Guardar este elemento a 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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Archivo"
 
@@ -26422,7 +26595,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Concertar un encuentro para este elemento"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Personalizar Mi Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26473,29 +26647,30 @@ msgid "Post a message to a Public folder"
 msgstr "Guardando mensajes en la carpeta"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Suscribirse a las carpetas..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o de-suscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Suscribirse a las carpetas..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
@@ -26593,7 +26768,7 @@ msgstr "Lista de Mensajes Encadenados"
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -26909,7 +27084,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Configurar los datos de la p�gina para la impresora actual"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27020,7 +27196,7 @@ msgstr "Citado"
 msgid "_Resend..."
 msgstr "_Reenviar..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -27035,14 +27211,14 @@ msgstr "Cerrar esta ventana"
 #: 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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Cerrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:222
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Vista"
 
@@ -27220,7 +27396,7 @@ msgstr "Guardar el elemento y cerrar la ventana de di�logo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window-menus.c:1325
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -27389,7 +27565,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Crear una _Nueva Carpeta..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
@@ -27408,116 +27584,136 @@ msgid "Pi_lot Settings..."
 msgstr "_Configuraci�n del pilot..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_Configuraci�n del pilot..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Crear una _Nueva Carpeta..."
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Configuraci�n del correo"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuraci�n del correo"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar informaci�n acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 msgid "_Folder..."
 msgstr "_Carpeta..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nuevo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Si_n recurrencia"
+msgid "_Remove Other User's Folder"
+msgstr "Crear una _Nueva Carpeta..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Configuraci�n del correo..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Barra de atajo_s"
@@ -27760,11 +27956,11 @@ msgstr "Codificaci�n de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Editor de b�squedas"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
@@ -27842,6 +28038,53 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "<- _Quitar"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_A�adir ->"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Buscando mensajes nuevos"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Esta carpeta no est� vac�a"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bytes"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Se ha olvidado de elegir una carpeta.\n"
+#~ "Vuelva y especifique una carpeta v�lida donde entregar el correo."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importando %s\n"
+#~ "El importador no esta listo.\n"
+#~ "Esperando 5 segundos antes de reintentar."
+
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Asistente de importaci�n de Evolution"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "Si_n recurrencia"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Error buscando la expresi�n."
 
@@ -27886,15 +28129,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Non-Participants"
 #~ msgstr "No participan"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Este mensaje no ha sido enviado.\n"
-#~ "\n"
-#~ "�Quiere guardar los cambios?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (predeterminada)"
@@ -28225,14 +28459,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgstr "Borrar todas menos la firma"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "Firma en _HTML:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Nombre de archivo:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "Firma en _HTML:"
 
@@ -28267,16 +28493,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_A�adir"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Eliminar"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "�Esta seguro que quiere borrar la carpeta �%s�?"
 
@@ -28371,12 +28587,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ "�No pude encontrar ninguna de tus identidades en la lista de "
 #~ "participantes!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Informaci�n de disponibilidad (de %s a %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Informaci�n de iCalendar"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tipo inv�lido en el contenido del cuerpo, esperando una cadena"
 
@@ -28645,9 +28855,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Tarea..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Configuraci�n del correo..."
-
 #~ msgid "_Apply Filters"
 #~ msgstr "_Aplicar filtro"
 
diff --git a/po/et.po b/po/et.po
index 88d796a0e4..34e0f6d1e3 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-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"
@@ -325,11 +325,17 @@ msgstr "Perekonnanimi"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Nimetu kontaktide nimekiri"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s jaoks"
@@ -340,47 +346,47 @@ msgstr "VKaart %s jaoks"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Otsin..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Laen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "�hendan LDAP serveriga..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Lisan kaardi LDAP serverisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Eemaldan kaardi LDAP serverist..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Muudan kaarti LDAP serveris..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "V�tan vastu LDAP otsingu tulemused..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Viga kaardi eemaldamisel"
@@ -399,13 +405,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook ei ole laetud\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 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:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "EI saa k�ivitada wombatit"
@@ -472,10 +478,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factory for the sample Addressbook control"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktid"
@@ -492,29 +498,39 @@ msgstr "LDAP server"
 msgid "LDAP server containing contact information"
 msgstr "Kontaktide infot sisaldav LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Kontaktide infot sisaldav kaust"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Loob uue kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Loob uue kontaktide nimekirja"
@@ -562,7 +578,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: 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"
 
@@ -570,11 +586,11 @@ msgstr "Ei saa gnome-vfs initsialiseerida"
 msgid "Other Contacts"
 msgstr "Teised kontaktid"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine eba�nnestus"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -582,7 +598,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:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -593,7 +609,7 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -605,7 +621,7 @@ msgstr ""
 "ise Evolution'i l�htetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP allj�rgneva viida abil.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -616,38 +632,51 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"SMTP serveri jaoks autentimine nurjus.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline v�li sisaldab"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Edasij�udnutele..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -655,7 +684,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -663,25 +692,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, mida kaustalehitseja n�itab"
 
@@ -748,53 +777,53 @@ msgid "  S_how Supported Bases "
 msgstr "_Tuvasta toetatavad t��bid"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "H��lestus"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr " _Eemalda"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Eemalda"
+
+#: 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 ""
@@ -931,48 +960,54 @@ msgstr "�ks"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, 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:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Otsin"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Vali k�ik"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Kustutatud"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -983,7 +1018,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -992,47 +1027,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Allika info"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "�hendun serverisse..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Toetamata skeem"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1040,7 +1075,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1049,7 +1084,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1057,7 +1092,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1067,7 +1102,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1077,27 +1112,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1107,7 +1142,7 @@ msgstr ""
 "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
 "n�itamiseks."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1115,11 +1150,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1128,25 +1163,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1154,49 +1189,49 @@ msgstr ""
 msgid "_Add"
 msgstr "_Lisa"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Lisa"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lisa tegevus"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lisa tegevus"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmid"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Kustuta k�ik"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "N_�ita"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1206,102 +1241,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Muuda kohtumist"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution'i alarm "
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_H��lestus"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Otsi _baasist:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Easil�kkamise aeg (minutites)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Taastan �henduse: %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "�ldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Otsin"
@@ -1316,8 +1351,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1348,11 +1383,11 @@ msgstr "(%d n�itamata)"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "Saatja sisaldab"
@@ -1426,7 +1461,7 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "T�psustused"
 
@@ -1486,13 +1521,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -1520,1029 +1555,1029 @@ msgstr "_Avaliku kalendri URL:"
 msgid "_Web page address:"
 msgstr "Kodulehe aad_ress"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "�hendriigid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Al�eeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Austraalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Aserbaid�aan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani ala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: 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:169
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kaimanisaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "T�aad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "T�iili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Hiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "J�ulusaar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: 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
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "K�pros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "T�ehhi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Taani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikaani vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Ida-Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Eesti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "F��ri saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Soome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Prantsuse Pol�neesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Prantsuse L�unaalad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Kreeka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Gr��nimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Heard ja McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Ungari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Iisrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Itaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Jaapan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Keenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Korea Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "K�rg�zstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "L�ti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: 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:252
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Korea Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "P�hja-Mariaanid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peruu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Poola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "S�o Tom� ja Pr�ncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Sei�ellid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "L�una-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Hispaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre And Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Teravm�ed"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�veits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tad�ikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Tansaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Tai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "T�rgi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "T�rkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Turks ja Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Araabia �hendemiraadid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "�hendkuningriik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "�hendriikida hajasaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "Neitsisaared, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "Neitsisaared, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "L��ne-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslaavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
@@ -2579,20 +2614,20 @@ msgstr "TTY/TDD"
 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Redigeeri k�ike"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "T�isnimi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-post"
 
@@ -2614,6 +2649,19 @@ 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Kirjutada fail �le?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Aadress _2:"
@@ -2744,7 +2792,7 @@ msgstr "kontaktide-nimekirja-redaktor"
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
@@ -2794,7 +2842,7 @@ msgstr ""
 "eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Eriotsing"
 
@@ -2803,25 +2851,25 @@ msgstr "Eriotsing"
 msgid "Search"
 msgstr "Otsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Viga %s k�ivitamisel"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2833,10 +2881,10 @@ msgid "Success"
 msgstr "�nnestus"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2844,7 +2892,7 @@ msgstr "Tundmatu viga"
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
@@ -2865,8 +2913,8 @@ msgstr "Mitte toetatud protokoll"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -2917,7 +2965,7 @@ 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:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
@@ -2934,9 +2982,8 @@ msgstr "Kuva"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -3026,7 +3073,7 @@ msgstr "Aadressiraamat"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
@@ -3112,7 +3159,7 @@ msgstr "Kopeeri"
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3120,8 +3167,8 @@ msgstr "Aseta"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "K�e_solev vaade"
@@ -3130,7 +3177,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3138,11 +3185,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3278,7 +3325,7 @@ msgid "Include:"
 msgstr "Lisa:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "R�htpaigutus"
 
@@ -3303,7 +3350,7 @@ msgid "Options"
 msgstr "H��lestus"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Suund"
 
@@ -3326,7 +3373,7 @@ msgstr "Paberiallikas:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "P�stpaigutus"
 
@@ -3388,20 +3435,20 @@ msgstr "Nimetu s�ndmus"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "K�rge"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Madal"
 
@@ -3412,13 +3459,17 @@ msgstr "Madal"
 msgid "Undefined"
 msgstr "M��ramata"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Viga kalendriserveriga suhtlemisel"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3530,11 +3581,11 @@ msgstr "Easil�kkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kohtumist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3546,13 +3597,13 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3569,16 +3620,16 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi k�ivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3627,7 +3678,7 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 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."
@@ -3704,9 +3755,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3723,13 +3774,13 @@ msgid "Assigned"
 msgstr "M��ratud"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Jah"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ei"
 
@@ -3749,82 +3800,102 @@ msgstr "N�dala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�lesanded"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "�lesandeid sisaldav kaust"
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "S�ndmus"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Lisab uue s�ndmuse"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Uudistekanalite seadistused"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Lisab uue �lesande"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_�lesanne"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Lisab uue �lesande"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue s�ndmuse"
@@ -3867,29 +3938,30 @@ 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:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "M�ngi heli:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Korda alarmi t�iendavalt"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "K�ivita programm:"
 
-#: 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 ""
-"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:7
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
@@ -3913,110 +3985,110 @@ msgstr "tundi"
 msgid "minutes"
 msgstr "minutit"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d p�eva"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 p�ev"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d n�dalat"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 n�dal"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d tundi"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 tund"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutit"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundit"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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:377
+#: 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:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Saada s�num"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
-#: 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 enne s�ndmuse algust"
 
-#: 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 p�rast s�ndmuse algust"
 
-#: 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 s�ndmuse alguses"
 
-#: 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 enne s�ndmuse l�ppu"
 
-#: 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 p�rast s�ndmuse l�ppu"
 
-#: 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 s�ndmuse l�pus"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: 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 tundmatule trigeri t��bile"
@@ -4037,7 +4109,7 @@ msgstr "Meeldetuletajad"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
@@ -4120,7 +4192,7 @@ msgid "Days"
 msgstr "P�ev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Reede"
 
@@ -4133,7 +4205,7 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Esmasp�ev"
 
@@ -4143,7 +4215,7 @@ msgid "S_un"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Laup�ev"
 
@@ -4156,7 +4228,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "P�hap�ev"
 
@@ -4175,7 +4247,7 @@ msgid "Task List"
 msgstr "�lesannete n_imekiri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Neljap�ev"
 
@@ -4192,7 +4264,7 @@ msgid "Time format:"
 msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Teisip�ev"
 
@@ -4201,7 +4273,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
@@ -4428,8 +4500,8 @@ msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
@@ -4498,27 +4570,27 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "S�ndmus"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Kohtumine"
 
@@ -4587,19 +4659,19 @@ msgstr "_L�pp:"
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "V�hemalt �ks osaleja peab olema m�rgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "See isik on juba osav�tja!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
@@ -4639,7 +4711,7 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4651,7 +4723,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -4727,48 +4799,48 @@ msgstr "."
 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:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "j�rgnevatel n�dalap�evadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Muu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "P�hjast"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "kuup�ev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "korda"
 
@@ -4863,7 +4935,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
@@ -4872,7 +4944,7 @@ msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4884,17 +4956,17 @@ msgstr "T�_htsus:"
 msgid "_Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "P�hiline"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4964,12 +5036,12 @@ msgid "100%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
@@ -4979,30 +5051,30 @@ msgstr "A_va"
 msgid "_Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5031,12 +5103,12 @@ msgstr "_M�rgi �lesanded l�petatuks"
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�lesande lisamiseks vajuta siia"
@@ -5045,8 +5117,8 @@ msgstr "�lesande lisamiseks vajuta siia"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "L�petatud"
 
@@ -5075,7 +5147,7 @@ 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:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kokkuv�te"
@@ -5142,122 +5214,122 @@ msgstr "el"
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Uus kogu p�eva _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tr�ki"
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mine t�nasele _p�evale"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_Mine kuup�evale..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/h�ivatud infot"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "H��lestus"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "H��lestus"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "M�rgi see s�ndmus _nihutatavaks"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see s�ndmus"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_�ik s�ndmused"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 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."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s k�ivitamisel."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "L�pp: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "L�petatud "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5265,333 +5337,339 @@ msgstr ""
 "<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "As_ukoht:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Vastu v�etud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Tagasi l�katud"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "N�ustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "L�kka tagasi"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Vaba/h�ivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Saadab v�rskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "T�hista"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise t�histamine"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise s�num"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas �lesande info."
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "�lesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Ettepanek �lesandeks"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "�lesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Soov muuta �lesannet"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "�lesande vastus"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas �lesande."
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "�lesande t�histamine"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Vigane �lesande s�num"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Vaba/h�ivatud info"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/h�ivatud infot"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Vaba/h�ivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/h�ivatud s�num"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, 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:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "S�num sisaldab ainult toetamata p�ringuid."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, 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:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, 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:1612
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -5637,7 +5715,7 @@ msgstr "alguskuup."
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
@@ -5651,52 +5729,52 @@ msgid "Resources"
 msgstr "Ressurss"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Individuaalne"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Grupp"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Ressurss"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Ruum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Juht"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 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:845
+#: calendar/gui/e-meeting-model.c:848
 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:846
+#: calendar/gui/e-meeting-model.c:849
 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:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Katseline"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Delegeeritud"
 
@@ -5787,43 +5865,50 @@ msgstr "Kohtumise _algus:"
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s �lesanded"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ei saa laadida '%s' �lesandeid"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, 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:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, 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:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Viga %s k�ivitamisel"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 #, fuzzy
 msgid "Expunging"
 msgstr "T�hjendan kausta"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Uus _s�ndmus..."
 
@@ -5837,7 +5922,13 @@ msgstr "Ei saa avada '%s' kausta"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarm %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5845,7 +5936,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5853,12 +5944,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Avan kausta %s"
@@ -5919,51 +6010,60 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Vaja on v�hemalt �hte osav�tjat"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Vaja on v�hemalt �hte osav�tjat"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Teave s�ndmuse kohta"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Teave �lesande kohta"
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Mittekohustuslik info"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Vaba/H�ivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Uuenda"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "V�rskenda nimekirja"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iKalendri informatsioon"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
@@ -6199,7 +6299,7 @@ msgid "Print Calendar"
 msgstr "Tr�ki kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Tr�kkimise eelvaade"
@@ -6223,7 +6323,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Kuvatava �lesannete kausta URI"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6236,12 +6336,12 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tr�ki kaardid"
@@ -6315,17 +6415,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Meeldetuletaja"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendri s�num"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6334,116 +6434,121 @@ msgstr ""
 "Evolution leidis Pine postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now n�uab 0 argumenti"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time n�uab 1 argumenti"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 1. argument peab olema string"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time 1. argument peab olema ISO 8601 vormingus kuup�eva/kella string"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day vajab 2 argumenti"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 1. argument peab olema time_t"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Otsinguavaldise t�itmine ei andnud t�ev��rtuset��pi v��rtust"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Muu viga"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8040,82 +8145,82 @@ 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:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri anal��sil: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri t�itmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole v�imalik avada"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole v�imalik t��delda"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "V�etakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
@@ -8163,11 +8268,11 @@ msgstr "Toetamata operatsioon: otsimine avaldise j�rgi: %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toetamata operatsioon: otsing UID j�rgi: %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "S�numite liigutamine"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "S�numite liigutamine"
@@ -8483,7 +8588,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -8540,52 +8645,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vajab kasutajanime osa"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vajab hosti osa"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
@@ -8784,7 +8889,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8793,11 +8898,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8814,7 +8919,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8864,68 +8969,76 @@ msgstr "Kausta �mbernimetamine nurjus: %s: vigane operatsioon"
 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:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Serveri vastus l�ppes liiga vara."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuv�tet"
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8941,28 +9054,24 @@ msgstr ""
 "Ei saa k�tte s�numit: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "S�numit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "See s�num ei ole hetkel k�ttesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "V�tan kokkuv�tvat infot uute s�numite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Kontrollin uute s�numite olemasolu"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia s�numi sisu FETCH vastuses."
 
@@ -8979,6 +9088,11 @@ msgstr "Ei suuda avada puhverkataloogi: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Kontrollin uusi s�numeid"
@@ -9025,77 +9139,72 @@ msgstr "Parool"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s teenus %s jaoks %s peal"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "�hendus katkestatud"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Kaust ei ole t�hi"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimist��bi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9103,24 +9212,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, 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:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9199,8 +9308,8 @@ msgstr ""
 "puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9212,7 +9321,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
@@ -9226,32 +9335,32 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, 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:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, 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:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9271,6 +9380,7 @@ 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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9282,12 +9392,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9313,7 +9425,8 @@ 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:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ei saa lugeda kausta '%s': %s"
@@ -9343,7 +9456,7 @@ msgid "Storing folder"
 msgstr "Kausta s�ilitamine"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
@@ -9512,40 +9625,45 @@ msgstr "'%s' ei ole kataloog"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, 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:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kausta '%s/%s' ei ole olemas."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ei ole tavaline fail."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "S�ilitan Kausta '%s'"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -9635,50 +9753,50 @@ msgstr "T�hista"
 msgid "Operation failed: %s"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "V�tan vastu POP kokkuv�tet"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "H�vitan kustutatud s�numid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "V�tan vastu POP s�numit nr %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, 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:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Teadmata sademed"
@@ -9945,45 +10063,45 @@ msgstr "Ajutine autentimine eba�nnestus"
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s SMTP parool"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9994,90 +10112,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: 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:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 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:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "S�numi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH p�ring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
@@ -10085,81 +10203,72 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 bait"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u baiti"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Lisa s�numile manus"
 
@@ -10191,7 +10300,7 @@ msgstr "MIME t��p:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
@@ -10202,45 +10311,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10249,12 +10358,12 @@ msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kirjeldus puudub"
@@ -10269,7 +10378,7 @@ msgstr "Lisab s�numile faili"
 msgid "Could not create a PGP signature context"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10278,48 +10387,48 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Hoiatus!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada �le?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10328,7 +10437,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10336,34 +10445,56 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid �ritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"S�num on saatmata.\n"
+"\n"
+"Kas sa soovid muudatused salvestada?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Allkirja salvestamine"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "S�numi koostamine"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Ei saa luua s�numiredaktori akent:\n"
+"Ei saa aktiveerida HTML redaktori komponenti."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10371,21 +10502,22 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
-msgid "Cannot initialize Evolution's composer."
-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"
@@ -10435,8 +10567,8 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10585,7 +10717,8 @@ msgid "years"
 msgstr "aastat"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Sa unustasid kuup�eva valimata."
 
 #: filter/filter-datespec.c:269
@@ -10640,17 +10773,13 @@ msgstr "Siis"
 msgid "Add action"
 msgstr "Lisa tegevus"
 
-# !PARANDA! - kas "mine tagasi" on ikka hea?
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Sa unustasid kausta valimata.\n"
-"Palun mine tagasi ja vali kaust, kuhu post toimetada."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Stiili nimi:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Vali kaust"
 
@@ -10663,7 +10792,7 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "T�htis"
@@ -10852,228 +10981,232 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisaldab"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Vastuv�tmise kuup�ev"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Saatmise kuup�ev"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisalda"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei l�ppe"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemas"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemas"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ei k�la kui"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei alga"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Ei ole olemas"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Mustand"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "l�ppeb"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "On olemas"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "on olemas"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "on p�rast"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "on enne"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "T�histatud"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurem kui"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on v�iksem kui"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "T�histatud"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Postiloend (list)"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "S�numi sisu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Kirja p�is"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "T�sta kausta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Saada kontaktile s�num"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Loetud"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Adressaadid"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regulaaravaldis vastab"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurem kui"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "on v�iksem kui"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "M��ra olek"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "k�lab kui"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "L�htekonto"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "P�ise erip�ra"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "algab"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Peata t��tlemine"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Teema"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "M��ra olek"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "sisaldab"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "ei sisalda"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "ei l�ppe"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "ei ole olemas"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemas"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "ei k�la kui"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "ei alga"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "l�ppeb"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "on olemas"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "T�histatud"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is after"
+msgstr "on p�rast"
+
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "is before"
+msgstr "on enne"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "on suurem kui"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "on v�iksem kui"
+
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "T�histatud"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurem kui"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "on v�iksem kui"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "k�lab kui"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "algab"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reeglid"
@@ -11107,31 +11240,31 @@ msgstr ""
 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:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Impordin"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Palun oota"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Post"
 
@@ -11192,39 +11325,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Pr�gi"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Kohaliku posti fail %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "S�tted"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Muuda filtreid"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11338,103 +11471,114 @@ msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Avalik"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "�lesandeid sisaldav kaust"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "See kaust ei saa sisaldada s�numeid."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Saada s�num"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "S�numi koostamine"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Eelmisele s�numile"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
-msgstr ""
+#: 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:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "�hendun serverisse..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" omadused"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Omadused"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
@@ -11479,140 +11623,140 @@ msgstr "saadetud: %d"
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "L�petatud"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VKaust _postiloendi j�rgi"
@@ -11683,20 +11827,20 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua �he nimega kahte kontot."
 
@@ -11713,14 +11857,14 @@ 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:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Keela"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Luba"
 
@@ -11798,8 +11942,8 @@ msgstr ""
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
 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 ""
 
 #: mail/mail-callbacks.c:270
@@ -11835,78 +11979,78 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 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:1206
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Kirjutada fail �le?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Kuvab j�rgmise lugemata s�numi"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11918,7 +12062,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11927,64 +12071,64 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Kirjeldus puudub"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetu kontakt"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Saadetud"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lisa tingimus"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Allkirja salvestamine"
@@ -12041,16 +12185,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "�hendun serverisse..."
 
@@ -12769,78 +12913,74 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Kuva s�numi sees"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Kuva s�numi sees (%s abil)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "�ra kuva"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "_Lae pildid"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Hilinenud �lesanded:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
@@ -12849,151 +12989,147 @@ msgstr "Salvesta pilt kui..."
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Postiprogramm:"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 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:1867
+#: mail/mail-format.c:1861
 #, 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:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, 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:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13230,20 +13366,20 @@ msgstr "Ootan..."
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas t��."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_J�ta see parool meelde"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
@@ -13252,11 +13388,11 @@ msgstr "Sisesta parool"
 msgid "Could not save signature file: %s"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13266,11 +13402,12 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML allkiri:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -13306,7 +13443,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "VKaustad"
 
@@ -13336,67 +13473,67 @@ msgstr "(Teema puudub)"
 msgid "%s - Message"
 msgstr "%s - s�num"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "N�gemata"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "N�htud"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Mitu n�gemata s�numit"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Mitu s�numit"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "K�rge"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "K�rgeim"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "T�na %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "S�numite nimekirja koostamine"
 
@@ -13471,45 +13608,71 @@ msgstr "Vasta k�igile"
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "L�petatud"
+
+#: 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 "Puhasta"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "T�htaeg "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Faili nimi:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Kontrollin juurtaseme kaustu servers \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimine"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimuse l�petamine"
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salvesta kausta..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "�htegi serverit ei ole valitud"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Palun vali server."
 
@@ -23413,12 +23576,12 @@ msgstr "%l:%M %d. %B"
 msgid "No description"
 msgstr "Kirjeldus puudub"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "S�numite kokkuv�te"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
@@ -23428,23 +23591,23 @@ msgstr "Kohalikud kaustad"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "EETN"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "P�eva lause"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Lisa uudistekanal"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Sisesta lisatava uudistekanali URL"
 
@@ -23484,11 +23647,11 @@ msgstr "(Kirjeldus puudub)"
 msgid "My Weather"
 msgstr "Ilmateade"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Ilm"
 
@@ -24816,6 +24979,11 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Ava programmiga %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25037,12 +25205,25 @@ msgid "Rename folder"
 msgstr "Kausta nime muutmine"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Kausta �mbernimetamine eba�nnestus:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25051,12 +25232,12 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Loo _uus kaust..."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Uus..."
 
@@ -25081,20 +25262,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
-#. 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 ""
-"Impordin %s\n"
-"Importija ei ole valmis.\n"
-"Proovin 5 sekundi p�rast uuesti."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25103,22 +25271,22 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25127,11 +25295,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25140,17 +25308,17 @@ msgstr ""
 "Impordin %s.\n"
 "K�ivitan %s"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s k�ivitamisel"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25159,32 +25327,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Faili t��p:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Impordi teiste programmide andmeid ja s�tted"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Impordi �ksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25192,24 +25360,24 @@ msgstr ""
 "Palun oota...\n"
 "�ritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Impordi"
 
@@ -25237,32 +25405,32 @@ msgstr "Kausta s�nkroniseerimine"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ava programmiga %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25302,44 +25470,44 @@ msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Ava kaust..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Vali kaust, mida soovid avada"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -25347,27 +25515,27 @@ msgstr "Siirdu autonoomsesse olekusse"
 msgid "(No folder displayed)"
 msgstr "(Kausta ei n�idata)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(Puudub)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 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:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25382,12 +25550,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25398,19 +25566,19 @@ 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:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "�ldine viga"
 
@@ -25550,58 +25718,62 @@ msgstr "Kiirvalikud"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Vigu ei tekkinud"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Selle nimega kaust on juba olemas"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Kirjeldatud kaustat��p on vigane"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O viga"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Pole piisavalt ruumi kausta loomiseks"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Kaust ei ole t�hi"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Antud kausta ei leitud"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Operatsioon ei ole toetatud"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Sa ei saa luua selle nimega kausta"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25811,7 +25983,7 @@ msgstr ""
 #: shell/glade/evolution-startup-wizard.glade.h:15
 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. "
 msgstr ""
@@ -25825,26 +25997,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution'i impordiassistent"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution'i impordiassistent"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Impordi fail (samm 3/3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Impordi t��p (samm 1/3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Vali importijad (samm 2/3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Vali fail (samm 2/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"
@@ -26058,10 +26226,10 @@ msgstr "k�esoleva hetkega"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Tegevused"
 
@@ -26181,7 +26349,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Salvesta"
 
@@ -26208,7 +26376,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Fail"
 
@@ -26290,8 +26458,9 @@ msgid "Schedule a meeting for this item"
 msgstr ""
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Ximian Evolutionist"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -26340,29 +26509,30 @@ msgid "Post a message to a Public folder"
 msgstr "Salvestan s�numi kausta"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Kaustade _tellimine..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "N�itab s�numi eelvaate akent"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuaalse kausta _redaktor..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtrid..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Eelvaate paan"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "Kaustade _tellimine..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
@@ -26456,7 +26626,7 @@ msgstr "Esitab s�numeid jutul�ngadena"
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Kaust"
 
@@ -26773,7 +26943,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud s�numi sisust"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Lehek�lje s�tted aktiivse printeri jaoks"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26887,7 +27058,7 @@ msgstr "Tsitaadina"
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "T_��riistad"
 
@@ -26902,12 +27073,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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Sulge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_Vaade"
 
@@ -27081,7 +27252,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Abi"
 
@@ -27250,7 +27421,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Loo _uus kaust..."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -27267,115 +27438,135 @@ msgid "Pi_lot Settings..."
 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
 msgid "Send / Receive"
 msgstr "Saada / v�ta vastu"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, 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:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "E-posti seadistamine"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "E-posti seadistamine"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "N�ita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "L�litab kaustade riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "L�litab kiirvkorralduste riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "L�litab autonoomse reziimi sisse v�i v�lja"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "N�itab valitud kausta"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "Ko_peeri..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Kaustade riba"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Kaust"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Mine kausta"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_T�sta mujale..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Uus k_aust"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "E_i kordu"
+msgid "_Remove Other User's Folder"
+msgstr "Loo _uus kaust..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Saada / V�ta vastu"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_S�numite s�tted..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Kiir_valikute riba"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Kiir_valik"
@@ -27617,11 +27808,11 @@ msgstr "Kodeering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
@@ -27701,6 +27892,51 @@ msgstr "init_corba(): GNOME l�htestamine nurjus"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr " _Eemalda"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Lisa"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Kontrollin uute s�numite olemasolu"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Kaust ei ole t�hi"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bait"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u baiti"
+
+# !PARANDA! - kas "mine tagasi" on ikka hea?
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Sa unustasid kausta valimata.\n"
+#~ "Palun mine tagasi ja vali kaust, kuhu post toimetada."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Impordin %s\n"
+#~ "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"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Viga otsingu avaldises."
 
@@ -27745,15 +27981,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Non-Participants"
 #~ msgstr "Mitteosalejad"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "S�num on saatmata.\n"
-#~ "\n"
-#~ "Kas sa soovid muudatused salvestada?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (vaikimisi)"
@@ -27992,14 +28219,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Select a signature script"
 #~ msgstr "Kustuta k�ik peale allkirja"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML allkiri:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Faili nimi:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML allkiri:"
 
@@ -28024,14 +28243,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Riga"
 #~ msgstr "Riia"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Lisa"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr " _Eemalda"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Kas sa t�esti tahad kustutada kausta \"%s\"?"
 
@@ -28372,12 +28583,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Osav�tjate nimekirjast ei leitud �htegi sinu identiteeti!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iKalendri informatsioon"
-
 #, fuzzy
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "(body-contains) Vale t��p, oodati stringi"
@@ -28587,9 +28792,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_Task..."
 #~ msgstr "_�lesanne"
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_S�numite s�tted..."
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Saada manusena"
 
diff --git a/po/eu.po b/po/eu.po
index ab51aa12ed..6d75f84d90 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-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"
@@ -318,11 +318,17 @@ msgstr "Deitura"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Kontaktu-zerrenda izengabea"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
@@ -333,47 +339,47 @@ msgstr "%s(r)en VCard-a"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP zerbitzariarekin konektatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "LDAP zerbitzarian txartela gehitzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "LDAP zerbitzaritik txartela kentzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP zerbitzariko txartela aldatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errorea txartela kentzean"
@@ -391,13 +397,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook ez dago kargatuta\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 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:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Ezin izan da wombat abiarazi"
@@ -464,10 +470,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktuak"
@@ -484,28 +490,38 @@ msgstr "LDAP zerbitzaria"
 msgid "LDAP server containing contact information"
 msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Kontaktuen informazioa duen karpeta"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
@@ -554,7 +570,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: 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"
 
@@ -562,11 +578,11 @@ msgstr "Ezin izan da gnome-vfs hasieratu"
 msgid "Other Contacts"
 msgstr "Beste kontaktu batzuk"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -574,7 +590,7 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -585,7 +601,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 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,7 +613,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -608,38 +624,51 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"Ezin da IMAP zerbitzarirako autentifikatu.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -647,7 +676,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -655,25 +684,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
@@ -740,53 +769,53 @@ msgid "  S_how Supported Bases "
 msgstr "_Begiratu zein mota onartzen diren"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Aukerak"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "_Kendu"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Kendu"
+
+#: 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 ""
@@ -929,50 +958,56 @@ msgstr "Bat"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Lehenespenak"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, 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:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Hautatu denak"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Ezabatuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -983,7 +1018,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -992,47 +1027,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Iturburu-informazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Onartzen ez den eskema"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1040,7 +1075,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1049,7 +1084,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1057,7 +1092,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1067,7 +1102,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1077,13 +1112,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1093,7 +1128,7 @@ msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1103,7 +1138,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1113,7 +1148,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1121,11 +1156,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1134,26 +1169,26 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1161,51 +1196,51 @@ msgstr ""
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
-msgstr "_Gehitu"
+msgid "_Add ->"
+msgstr "Gehitu"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmak"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Ezaba_tu dena"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1215,103 +1250,103 @@ msgstr "_Deskarga-muga"
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editatu hitzordua"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution-en alarma"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "Au_kerak"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Lehenespenak"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "%d kontua"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
@@ -1326,8 +1361,8 @@ msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1358,11 +1393,11 @@ msgstr "(%d ez da erakusten)"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "bidaltzaileak hau dauka"
@@ -1436,7 +1471,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -1496,13 +1531,13 @@ 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:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -1530,1024 +1565,1024 @@ msgstr "Egu_tegi publikoaren URLa:"
 msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Aljeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Samoa amerikarra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antartika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua eta Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: 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:141
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Bouvet uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Indiako Ozeanoko Britainiar Lurraldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 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:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kanbodia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: 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:169
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kaiman uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Erdialdeko Afrikar Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Txad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Txile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Txina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Christmas uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos Keeling uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolonbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Komoroak"
 
-#: 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
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Cook uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Boli Kosta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroazia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: 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:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Zipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Txekiar errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikar errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Ekialdeko Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ekuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekuatore Ginea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Malvina uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Faroe uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Frantzia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guyana frantsesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinesia frantsesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Hegoaldeko lurralde frantsesak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grezia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Ginea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Ginea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Heard eta McDonald uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Vatikano Hiriko Estatua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "Koreako Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Letonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxenburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Mazedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldivak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr "Marshall uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Maurizio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Mikronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr "Moldaviako Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozanbike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Birmania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Antilla herbeheretarrak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Kaledonia berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Zeelanda Berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "Iparraldeko Mariana uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvegia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Palestinako lurraldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Ginea Berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filipinak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Errumania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Errusiar Federakundea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts eta Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Santa Luzia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent eta Grenadinak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome eta Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seychelleak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Salomon uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Hegoafrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espainia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre eta Mikelune"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard eta Jan Mayen uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Swazilandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suedia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suitza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzaniako Errepublika Batua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thailandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad eta Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Turk eta Caico uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Arabiar Emirerri Batuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "Estatu Batuetako kanpoaldeko uharte txikiak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "Birjina uharteak (britainiarrak)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "Birjina uharteak (amerikarrak)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis eta Futuna uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Mendebaldeko Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
@@ -2583,20 +2618,20 @@ msgstr "Teletipoa"
 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Editatu osorik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Izen osoa"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "Helb. el."
 
@@ -2618,6 +2653,19 @@ 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Fitxategia gainidatzi?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "_2. helbidea:"
@@ -2748,7 +2796,7 @@ msgstr "contact-list-editor"
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2798,7 +2846,7 @@ msgstr ""
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
@@ -2807,25 +2855,25 @@ msgstr "Bilaketa aurreratua"
 msgid "Search"
 msgstr "Bilatu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "txartel bat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d txartel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2837,10 +2885,10 @@ msgid "Success"
 msgstr "Behar bezala egin da"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2848,7 +2896,7 @@ msgstr "Errore ezezaguna"
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
@@ -2869,8 +2917,8 @@ msgstr "Protokoloa ez da onartzen"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
@@ -2921,7 +2969,7 @@ 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:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
@@ -2934,11 +2982,10 @@ msgid "Display Cards"
 msgstr "Txartelak bistaratu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:213
-#, c-format
+#, 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 ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
@@ -3026,7 +3073,7 @@ msgstr "Helbide-liburua"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
@@ -3110,7 +3157,7 @@ msgstr "Kopiatu"
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3118,8 +3165,8 @@ msgstr "Itsatsi"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3128,7 +3175,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3136,11 +3183,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3272,7 +3319,7 @@ msgid "Include:"
 msgstr "Sartu:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horizontala"
 
@@ -3297,7 +3344,7 @@ msgid "Options"
 msgstr "Aukerak"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientazioa"
 
@@ -3320,7 +3367,7 @@ msgstr "Paper-iturria:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Bertikala"
 
@@ -3382,20 +3429,20 @@ msgstr "Hitzordu izengabea"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Handia"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Txikia"
 
@@ -3406,13 +3453,17 @@ msgstr "Txikia"
 msgid "Undefined"
 msgstr "Definitu gabe"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 
@@ -3522,11 +3573,11 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3538,13 +3589,13 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Abisua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3561,15 +3612,15 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -3618,7 +3669,7 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3697,9 +3748,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3716,13 +3767,13 @@ msgid "Assigned"
 msgstr "Esleitua"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Bai"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ez"
 
@@ -3742,76 +3793,96 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zereginak"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Egiteko elementuak dauzkan karpeta"
 
-#: calendar/gui/component-factory.c:709
+#: 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:735
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "_Bilera"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria."
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
@@ -3855,29 +3926,30 @@ 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:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Jo soinua:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Errepikatu alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Ireki programa:"
 
-#: 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 ""
-"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:7
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
@@ -3901,110 +3973,110 @@ msgstr "ordu "
 msgid "minutes"
 msgstr "minutu "
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d egun"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "egun bat"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "aste bat"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d ordu"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "ordubete"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutu"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "minutu bat"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "segundo bat"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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:377
+#: 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:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Bidali mezua"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: 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:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
-#: 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 hitzordua hasi aurretik"
 
-#: 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 hitzordua hasi ondoren"
 
-#: 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 hitzorduaren hasieran"
 
-#: 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 hitzordua amaitu aurretik"
 
-#: 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 hitzordua amaitu ondoren"
 
-#: 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 hitzorduaren amaieran"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s - %s"
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
@@ -4025,7 +4097,7 @@ msgstr "Oroigarriak"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4108,7 +4180,7 @@ msgid "Days"
 msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4121,7 +4193,7 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4131,7 +4203,7 @@ msgid "S_un"
 msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4144,7 +4216,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4163,7 +4235,7 @@ msgid "Task List"
 msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4180,7 +4252,7 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4189,7 +4261,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -4415,8 +4487,8 @@ msgid "No summary"
 msgstr "Laburpenik ez"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Gorde honela..."
 
@@ -4485,27 +4557,27 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Bilera"
 
@@ -4574,19 +4646,19 @@ msgstr "_Amaiera-ordua:"
 msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr "Pertsona hori lehendik dago bileran!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
@@ -4627,7 +4699,7 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4639,7 +4711,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
@@ -4715,48 +4787,48 @@ msgstr "."
 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:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo "
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Bestelakoa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "Iparraldea"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Beste fax bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "eguna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "aldiz"
 
@@ -4850,7 +4922,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
@@ -4859,7 +4931,7 @@ msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URLa:"
 
@@ -4871,17 +4943,17 @@ msgstr "_Lehentasuna:"
 msgid "_Status:"
 msgstr "_Egoera:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4951,12 +5023,12 @@ msgid "100%"
 msgstr "%100"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
@@ -4966,30 +5038,30 @@ msgstr "_Ireki"
 msgid "_Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5018,12 +5090,12 @@ msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -5032,8 +5104,8 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5062,7 +5134,7 @@ msgid "Start Date"
 msgstr "Hasiera-data"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Laburpena"
@@ -5129,448 +5201,454 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Hitz_ordu berria"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguratu %s"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfiguratu %s"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 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:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, 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:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, 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:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, 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:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, 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:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, 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:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, 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:1612
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -5616,7 +5694,7 @@ msgstr "data-hasiera"
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
@@ -5630,52 +5708,52 @@ msgid "Resources"
 msgstr "Baliabidea"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Taldea"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Gela"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Mahaiburua"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 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:845
+#: calendar/gui/e-meeting-model.c:848
 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:846
+#: calendar/gui/e-meeting-model.c:849
 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:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 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:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Delegatua"
 
@@ -5765,42 +5843,49 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, 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:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, 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:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Errorea %s abiaraztean"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
@@ -5814,7 +5899,13 @@ msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "%s alarma"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5822,7 +5913,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5830,12 +5921,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s karpeta irekitzen"
@@ -5896,49 +5987,58 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Partaide bat behar da gutxienez"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Partaide bat behar da gutxienez"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Egunkari-informazioa"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Eguneratu"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "Freskatu zerrenda"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Libre/okupatuta informazioa (%s - %s)"
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar informazioa"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
@@ -6174,7 +6274,7 @@ msgid "Print Calendar"
 msgstr "Inprimatu egutegia"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
@@ -6198,7 +6298,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6210,12 +6310,12 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Inprimatu txartelak"
@@ -6286,17 +6386,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Ezin izan da biltegiarekin konektatu: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Oroigarria"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6305,84 +6405,84 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Egutegia"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "'time-now'k 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "'make-time'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "'make-time'k espero du 1 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "'make-time'ren 1 argumentuak ISO 8601 data/ordu katea izan behar du."
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "'time-add-day'k 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "'time-add-day'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "'time-add-day'k espero du 2 argumentua osoko zenbakia izatea"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "'time-day-begin'ek argumentu bat espero du"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "'time-day-begin'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "'time-day-end'ek argumentu bat espero du"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "'time-day-end'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "'get-vtype'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "'occur-in-time-range?'k 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "'occur-in-time-range?'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "'occur-in-time-range?'k espero du 2 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "'contains?'ek 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "'contains?'ek espero du 1 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "'contains?'ek espero du 2 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6390,11 +6490,11 @@ msgstr ""
 "'contains?'ek espero du 1 argumentua \"any\", \"summary\", edo \"description"
 "\" izatea"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "'has-categories?'ek gutxienez argumentu bat espero du"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6402,22 +6502,27 @@ msgstr ""
 "'has-categories?'ek espero du argumentu guztiak kateak izatea eta argumentu "
 "bakarra izatea boolear faltsua (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "'is-completed?'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "'completed-before?'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "'completed-before?'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Bilaketa-adierazpenaren ebaluazioak ez du balio boolearrik eman"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Beste errore bat"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8011,81 +8116,81 @@ 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:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
@@ -8132,11 +8237,11 @@ msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Mezuak eramaten"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
@@ -8465,7 +8570,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -8524,52 +8629,52 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, 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:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
@@ -8768,7 +8873,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8781,11 +8886,11 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr "TXARRA"
 
@@ -8807,7 +8912,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8863,68 +8968,76 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 "Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr "Zerbitzariaren erantzuna lasterregi amaitu da."
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, 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:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8940,28 +9053,24 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Mezu berrien bila eskaneatzen"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -8978,6 +9087,11 @@ msgstr "Ezin izan da cache-direktorioa ireki: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Mezu berririk dagoen begiratzen"
@@ -9026,78 +9140,73 @@ msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, 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:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Karpeta ez dago hutsik"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9108,24 +9217,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, 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:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
@@ -9202,8 +9311,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:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
@@ -9215,7 +9324,7 @@ 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:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
@@ -9229,32 +9338,32 @@ msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, 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:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, 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:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ezin izan da laburpena gorde: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
@@ -9274,6 +9383,7 @@ 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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9285,12 +9395,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
 #, 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
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9316,7 +9428,8 @@ 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:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %s"
@@ -9346,7 +9459,7 @@ msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
@@ -9517,40 +9630,45 @@ msgstr "`%s' ez da direktorioa."
 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:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, 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:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' karpetarik ez dago."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ez da fitxategi erregularra."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool-eko posta fitxategia"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-karpetak ezin dira ezabatu"
 
@@ -9644,47 +9762,47 @@ msgstr "Utzi bertan behera"
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr "Erabiltzaileak bertan behera utzi du"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ezin da POP laburpena hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ezin da %s mezua hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -9955,46 +10073,46 @@ msgstr "Aldi baterako autentifikazioak huts egin du"
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10005,88 +10123,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 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:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -10094,77 +10212,68 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -10196,7 +10305,7 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10207,45 +10316,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10256,12 +10365,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Azalpenik ez"
@@ -10276,7 +10385,7 @@ msgstr "Erantsi fitxategi bat"
 msgid "Could not create a PGP signature context"
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10285,34 +10394,34 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Kontuz!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10321,7 +10430,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10330,7 +10439,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10339,7 +10448,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10347,28 +10456,39 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Mezu hau ez da bidali.\n"
+"\n"
+"Aldaketak gorde nahi dituzu?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10376,7 +10496,18 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da HTML editorearen osagaia aktibatu."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10384,13 +10515,13 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10398,8 +10529,9 @@ msgstr ""
 "Ezin izan da mezuak prestatzeko leihoa sortu, oraindik ez \n"
 "duzulako identitaterik konfiguratu posta-osagaian."
 
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: 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
@@ -10450,8 +10582,8 @@ 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:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10599,7 +10731,8 @@ msgid "years"
 msgstr "urte "
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Data aukeratzea ahaztu zaizu."
 
 #: filter/filter-datespec.c:269
@@ -10655,15 +10788,12 @@ msgid "Add action"
 msgstr "Gehitu ekintza"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Karpeta aukeratzea ahaztu zaizu.\n"
-"Zoaz atzera eta zehaztu posta banatzeko baliozko karpeta bat."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
@@ -10676,7 +10806,7 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Garrantzitsua"
@@ -10865,224 +10995,228 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "hau dauka"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ez dauka hau"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ez da honela hasten"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Ez"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "honela amaitzen da"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "badago"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "da"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "honen ondorengoa da"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "honen aurrekoa da"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Banderaduna da"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ez da"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Irakurrita"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "hau baino txikiagoa da"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "honen antzekoa da"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "honela hasten da"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "hau dauka"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "ez dauka hau"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "badago"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "ez da"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "da"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "honela hasten da"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Arauak"
@@ -11116,31 +11250,31 @@ msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 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:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Inportatzen..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Itxaron"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s inportatzen %s gisa."
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Posta"
 
@@ -11201,39 +11335,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 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:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s posta-fitxategi lokala"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editatu iragazkiak"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11353,26 +11487,36 @@ msgid "Folder containing mail"
 msgstr "Posta duen karpeta"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Publikoa"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Posta duen karpeta"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Zakarrontzi birtualak"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11380,78 +11524,79 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mezu berria"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Aurreko mezua"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: 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:1067
+#: 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:1073
+#: 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:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" - propietateak"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propietateak"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
@@ -11496,141 +11641,141 @@ msgstr "%d bidali"
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
@@ -11703,20 +11848,20 @@ msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
@@ -11733,14 +11878,14 @@ 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:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Desgaitu"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Gaitu"
 
@@ -11829,9 +11974,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
@@ -11874,7 +12020,7 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11882,30 +12028,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, 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:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11913,7 +12059,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11921,32 +12067,32 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, 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:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11954,7 +12100,7 @@ msgstr ""
 "Karpeta honetan ez dago mezu gehiago.\n"
 "Hurrengo karpetara joan nahi duzu?"
 
-#: mail/mail-callbacks.c:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11966,7 +12112,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11975,64 +12121,64 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Azalpenik ez"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontaktu izengabea"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Bidalita"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gorde sinadura"
@@ -12094,16 +12240,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Kontua"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
@@ -12815,78 +12961,74 @@ 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:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ikusi barnean (%s bidez)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Kanpoko ikustailea"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
@@ -12895,108 +13037,109 @@ msgstr "Gorde irudia honela..."
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 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:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13005,27 +13148,22 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s ez da birkonfiguratuko ez delako karpeta lokala"
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13033,15 +13171,15 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13282,21 +13420,21 @@ msgstr "Zain..."
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:275
+#: 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:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
@@ -13305,11 +13443,11 @@ msgstr "Idatzi pasahitza"
 msgid "Could not save signature file: %s"
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Gorde sinadura"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13319,11 +13457,12 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML sinadura:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Izena:"
 
@@ -13363,7 +13502,7 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
@@ -13393,67 +13532,67 @@ msgstr "(Gairik ez)"
 msgid "%s - Message"
 msgstr "%s - Mezua"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -13527,46 +13666,72 @@ msgstr "Erantzun denei"
 msgid "Review"
 msgstr "Aurrebista"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Jarraitzeko bandera"
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Eginda"
+
+#: 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 "Garbitu ban_dera"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Noizko: "
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Fitxategi-izena:"
+
+#: mail/subscribe-dialog.c:229
 #, 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:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" karpetan harpidetzen"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Karpeta"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gorde karpetan..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
@@ -23469,12 +23634,12 @@ msgstr "%l:%M %B %d"
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Posta-laburpena"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
@@ -23484,23 +23649,23 @@ msgstr "Karpeta lokalak"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com-en Eguneko Hitza"
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Idatzi gehitu nahi duzun berri-iturriaren URLa"
 
@@ -23540,11 +23705,11 @@ msgstr "(Azalpenik ez)"
 msgid "My Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 msgid "Weather"
 msgstr "Eguraldia"
 
@@ -24871,6 +25036,11 @@ msgstr ""
 "Ezin izan da karpeta transferitu:\n"
 "%s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Ireki honekin: %s..."
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25112,12 +25282,25 @@ msgid "Rename folder"
 msgstr "Karpetaren izena aldatu"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Ezin izan da karpetaren izena aldatu:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25126,12 +25309,12 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Sortu _karpeta berria...."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Berria..."
 
@@ -25161,20 +25344,7 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#. 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 ""
-"%s inportatzen\n"
-"Inportatzailea ez dago prest.\n"
-"5 segundo itxaroten berriro saiatzeko."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25183,22 +25353,22 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25207,11 +25377,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25220,17 +25390,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25239,31 +25409,31 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25271,24 +25441,24 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Inportatu"
 
@@ -25316,32 +25486,32 @@ msgstr "Karpeta sinkronizatzen"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ireki honekin: %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, 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:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25383,44 +25553,44 @@ msgstr "Karpeta-izenak ezin du barrarik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-view-menu.c:178
+#: 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:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution-i buruz"
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Joan karpeta honetara..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr "Hautatu ireki nahi duzun karpeta"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 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:763
+#: shell/e-shell-view-menu.c:786
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
@@ -25428,27 +25598,27 @@ msgstr "Lan egin lineaz kanpo"
 msgid "(No folder displayed)"
 msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 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:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25467,12 +25637,12 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25483,19 +25653,19 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -25635,58 +25805,62 @@ msgstr "Lasterbideak"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Errorerik ez"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr "Badago lehendik izen hori duen karpeta bat"
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr "Adierazitako karpeta-mota ez da baliozkoa"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "S/Iko errorea"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr "Ez dago karpeta sortzeko behar adina leku"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr "Karpeta ez dago hutsik"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr "Adierazitako karpeta ez da aurkitu"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr "Eragiketa ez da onartzen"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 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:514
+#: shell/e-storage.c:584
 msgid "Cannot create a folder with that name"
 msgstr "Ezin da izen horretako karpetarik sortu"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -25901,9 +26075,10 @@ msgstr ""
 "Jarraitzeko, egin klik \"Hurrengoa\" botoian. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
+#, 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. "
 msgstr ""
@@ -25921,26 +26096,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution-en Inportatzeko laguntzailea"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution-en Inportatzeko laguntzailea"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Fitxategia inportatu (3 / 3 urratsa)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Inportatzaile-mota (1 / 3 urratsa)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Inportatzaileak hautatu (2 / 3 urratsa)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Fitxategia hautatu (2 / 3 urratsa)"
 
-#: 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"
@@ -26167,10 +26338,10 @@ msgstr "Ikusi uneko kontaktua"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -26288,7 +26459,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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Gorde"
 
@@ -26315,7 +26486,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -26397,7 +26568,8 @@ msgid "Schedule a meeting for this item"
 msgstr "Antolatu elementu honentzako bilera"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Pertsonalizatu Nire Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -26447,29 +26619,30 @@ msgid "Post a message to a Public folder"
 msgstr "Mezua karpetan gordetzen"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Egin karpeten harpidetza..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Erakutsi mezu-aurrebistaren leihoa"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Karpeta birtualen editorea..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Iragazkiak..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Au_rrebistako panela"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "_Egin karpeten harpidetza..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
@@ -26563,7 +26736,7 @@ msgstr "Hari bateko mezuen zerrenda"
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Karpeta"
 
@@ -26871,7 +27044,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -26982,7 +27156,7 @@ msgstr "_Aipamen gisa"
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "_Tresnak"
 
@@ -26997,12 +27171,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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Itxi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "I_kusi"
 
@@ -27176,7 +27350,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:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -27343,7 +27517,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Sortu _karpeta berria...."
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -27360,114 +27534,134 @@ msgid "Pi_lot Settings..."
 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
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Posta-konfigurazioa"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Posta-konfigurazioa"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "Txandakatu"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Erakutsi/ezkutatu lasterbide-barra "
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr "Bistaratu hautatutako karpeta"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "Ko_piatu..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Karpeta-barra"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Karpeta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "Berr_ia"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "Kar_peta berria"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Egutegi-hobespenak"
+msgid "_Remove Other User's Folder"
+msgstr "Sortu _karpeta berria...."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Postaren ezarpenak..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Lasterbidea"
@@ -27707,11 +27901,11 @@ msgstr "Karaktere-kodeketa"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr "Bilaketa-editorea"
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
@@ -27791,6 +27985,53 @@ 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 "&lt;- _Remove"
+#~ msgstr "_Kendu"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Gehitu"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Mezu berrien bila eskaneatzen"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Karpeta ez dago hutsik"
+
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u byte"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Karpeta aukeratzea ahaztu zaizu.\n"
+#~ "Zoaz atzera eta zehaztu posta banatzeko baliozko karpeta bat."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s ez da birkonfiguratuko ez delako karpeta lokala"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "%s inportatzen\n"
+#~ "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"
+
 #~ msgid "Error in search expression."
 #~ msgstr "Errorea bilaketa-adierazpenean."
 
@@ -27835,15 +28076,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Non-Participants"
 #~ msgstr "Ez-partaideak"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Mezu hau ez da bidali.\n"
-#~ "\n"
-#~ "Aldaketak gorde nahi dituzu?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr "(lehenetsia)"
@@ -28182,14 +28414,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Ezabatu dena sinadura izan ezik"
 
 #, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML sinadura:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Fitxategi-izena:"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML sinadura:"
 
@@ -28220,14 +28444,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Riga"
 #~ msgstr "Riga"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Gehitu"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "_Kendu"
-
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Ziur zaude \"%s\" karpeta kendu nahi duzula?"
 
@@ -28317,12 +28533,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Ezin da zure identitaterik aurkitu partaideen zerrendan!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Libre/okupatuta informazioa (%s - %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar informazioa"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Mota baliogabea gorputzaren edukian, katea espero da"
 
@@ -28605,9 +28815,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "_Task..."
 #~ msgstr "_Zeregina..."
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_Postaren ezarpenak..."
-
 #~ msgid "_Apply Filters"
 #~ msgstr "_Aplikatu iragazkiak"
 
diff --git a/po/fi.po b/po/fi.po
index b494a8d28b..c6d3b2361b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2001-11-06 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -318,11 +318,17 @@ msgstr "Sukunimi"
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Nimet�n kontaktiluettelo"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -333,47 +339,47 @@ msgstr ""
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Etsit��n..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan yhteytt� LDAP-palvelimeen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 #, fuzzy
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
@@ -392,13 +398,13 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr ""
@@ -465,10 +471,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktit"
@@ -485,29 +491,39 @@ msgstr "LDAP-palvelin"
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktit"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Suodata postituslistan mukaan"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Luo uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Uusi kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Luo uusi kontaktiluettelo"
@@ -547,7 +563,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs:n alustus ei onnistunut"
 
@@ -555,24 +571,24 @@ msgstr "gnome-vfs:n alustus ei onnistunut"
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 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:487
+#: addressbook/gui/component/addressbook.c:490
 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:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -580,45 +596,55 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
 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:613
-#: addressbook/gui/component/addressbook.c:616
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Yhdist�minen palvelimeen ep�onnistui."
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
 #, c-format
-msgid "Enter password for %s (user %s)"
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Name begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -626,7 +652,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -634,25 +660,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -720,53 +746,53 @@ msgid "  S_how Supported Bases "
 msgstr "Tar_kista tuetut tavat"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Asetukset"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "Poista"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Asetukset"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -899,49 +925,55 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Etsi viesti�"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 #, fuzzy
 msgid "Searching"
 msgstr "Etsit��n..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Valitse kaikki"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Poistettu"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -952,7 +984,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -961,46 +993,46 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "L�hteen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Yhdistet��n LDAP-palvelimeen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1008,7 +1040,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1017,7 +1049,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1025,7 +1057,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1035,7 +1067,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1045,27 +1077,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1074,7 +1106,7 @@ msgid ""
 msgstr ""
 "T�t� nime� k�ytet��n tilisi tunnistamiseksi. Se on vain sinua itse�si varten"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1082,11 +1114,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1095,25 +1127,25 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "_T�m� on postitusosoite"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1121,48 +1153,48 @@ msgstr ""
 msgid "_Add"
 msgstr "_Lis��"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
 msgstr "_Lis��"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Poista kaikki"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_P�iv�"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1172,101 +1204,101 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Muokkaa tapaamista"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Asetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Etsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Tili"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktinhallinta"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Etsit��n..."
@@ -1281,8 +1313,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1313,11 +1345,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "L�hett�j�kentt� sis�lt��"
@@ -1395,7 +1427,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1456,13 +1488,13 @@ msgstr "Haluaa s�hk�postit HTML-muodossa"
 
 #: 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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1490,1027 +1522,1027 @@ msgstr ""
 msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "It�valta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaidzan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamasaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Valko-Ven�j�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermudasaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hertsegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Kambodza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: 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:169
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Caymansaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "Keski-Afrikan Tasavalta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tsad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Kiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Joulusaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr ""
 
-#: 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
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Tsekinmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Tanska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikaaninen Tasavalta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "P�iv�ntasaajan Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Viro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "F�rsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidzi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Ranska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Ranskan Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Saksa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Kreikka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Gr�nlanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Unkari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Intia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Tsekinmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: 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:247
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Liettua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: 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:260
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Nepali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Uusi Kaledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papua Uusi-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Puola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Ven�j�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 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:311
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Etel�-Afrikka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espanja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "Neitsytsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "Neitsytsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
@@ -2547,20 +2579,20 @@ msgstr ""
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalis�ys"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "S�hk�posti"
 
@@ -2580,6 +2612,19 @@ msgid ""
 "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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Kirjoita tiedoston yli?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -2710,7 +2755,7 @@ msgstr "kontaktinhallinta"
 msgid "Contact List Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2756,7 +2801,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -2765,25 +2810,25 @@ msgstr "Edistynyt haku"
 msgid "Search"
 msgstr "Etsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 kortti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d korttia"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2795,10 +2840,10 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2806,7 +2851,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2827,8 +2872,8 @@ msgstr ""
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Peruutettu"
 
@@ -2879,7 +2924,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
@@ -2896,9 +2941,8 @@ msgstr "Kirjoita viesti"
 #: addressbook/gui/widgets/e-addressbook-util.c:213
 #, 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 ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -2988,7 +3032,7 @@ msgstr "Osoitekirja"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -3074,7 +3118,7 @@ msgstr "Kopioi"
 msgid "Paste"
 msgstr "Liit�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3082,8 +3126,8 @@ msgstr "Liit�"
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen n�kym�"
@@ -3092,7 +3136,7 @@ msgstr "_Nykyinen n�kym�"
 #. 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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 ""
 
@@ -3100,11 +3144,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3228,7 +3272,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Vaaka"
 
@@ -3253,7 +3297,7 @@ msgid "Options"
 msgstr "Asetukset"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Suunta"
 
@@ -3276,7 +3320,7 @@ msgstr "Paperil�hde:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Pysty"
 
@@ -3338,20 +3382,20 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Matala"
 
@@ -3362,13 +3406,17 @@ msgstr "Matala"
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3480,11 +3528,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3492,13 +3540,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3509,16 +3557,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3571,7 +3619,7 @@ msgstr "%A, %e %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3646,9 +3694,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3665,13 +3713,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Kyll�"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ei"
 
@@ -3695,82 +3743,101 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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 "Kalenteri"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Tulosta kalenteri"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Teht�v�t"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tulosta kortti"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Suodata postituslistan mukaan"
+
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 #, fuzzy
 msgid "_Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "New meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 #, fuzzy
 msgid "_Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Luo uusi teht�v�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 #, fuzzy
 msgid "New task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Teht�v�"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 msgid "Create a new task"
 msgstr "Luo uusi teht�v�"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi tapaaminen"
@@ -3817,29 +3884,29 @@ 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
 #, fuzzy
 msgid "Message to Display"
 msgstr "Viestit"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 #, fuzzy
 msgid "Run program:"
 msgstr "Aja ohjelma"
 
-#: 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr ""
@@ -3864,116 +3931,116 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d p�iv��"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 #, fuzzy
 msgid "1 day"
 msgstr " 1 p�iv�"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 #, fuzzy
 msgid "1 week"
 msgstr " 1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekunti"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: 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.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "L�het� s�hk�postia"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: 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:413
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3995,7 +4062,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4081,7 +4148,7 @@ msgid "Days"
 msgstr "p�iv��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4096,7 +4163,7 @@ msgid "Minutes"
 msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4106,7 +4173,7 @@ msgid "S_un"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4120,7 +4187,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "N�yt� viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4139,7 +4206,7 @@ msgid "Task List"
 msgstr "Teht�v�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4159,7 +4226,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4168,7 +4235,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -4407,8 +4474,8 @@ msgid "No summary"
 msgstr "Ei kuvausta"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
@@ -4480,28 +4547,28 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
@@ -4577,19 +4644,19 @@ msgstr "_Loppumisaika:"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -4633,7 +4700,7 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4645,7 +4712,7 @@ msgstr "Rooli"
 
 #: 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
@@ -4722,48 +4789,48 @@ msgstr "."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 #, fuzzy
 msgid "first"
 msgstr "_Etunimi:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 #, fuzzy
 msgid "third"
 msgstr "Muut"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 #, fuzzy
 msgid "fourth"
 msgstr "tunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 #, fuzzy
 msgid "last"
 msgstr "Liit�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faksi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "p�iv�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr ""
 
@@ -4857,7 +4924,7 @@ 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lis�� toiminto"
@@ -4867,7 +4934,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -4879,18 +4946,18 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 #, fuzzy
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4960,13 +5027,13 @@ msgid "100%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
@@ -4976,30 +5043,30 @@ msgstr "_Avaa"
 msgid "_Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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 "T_ulosta..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:995 calendar/gui/e-day-view.c:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5029,12 +5096,12 @@ msgstr "Valmis"
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5043,8 +5110,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5073,7 +5140,7 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kuvaus"
@@ -5140,483 +5207,493 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 #, fuzzy
 msgid "_Configure..."
 msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "_Kontaktit..."
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 #, fuzzy
 msgid "An unknown person"
 msgstr "Tuntematon virhe"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 #, fuzzy
 msgid "Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 #, fuzzy
 msgid "Accept"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
 #, fuzzy
 msgid "Task Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -5663,7 +5740,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
@@ -5679,54 +5756,54 @@ msgid "Resources"
 msgstr "Paperil�hde:"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 #, fuzzy
 msgid "Group"
 msgstr "Ryhm�n nimi:"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Resource"
 msgstr "Paperil�hde:"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
@@ -5818,43 +5895,50 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Virhe %s:n k�ynnistyksess�"
+
+#: calendar/gui/e-tasks.c:540
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
@@ -5868,7 +5952,13 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Poistetaan kansiota %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5876,7 +5966,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5884,12 +5974,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synkronoidaan kansiota"
@@ -5950,54 +6040,64 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 #, fuzzy
 msgid "Calendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 #, fuzzy
 msgid "Updated"
 msgstr "Teht�v�t"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6238,7 +6338,7 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
@@ -6260,7 +6360,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6268,13 +6368,13 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tulosta kortti"
@@ -6335,17 +6435,17 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Muistutus"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenteri"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6354,115 +6454,120 @@ msgstr ""
 "Evolution l�ysi Pinen s�hk�postitiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalenteri"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:754
+#: 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 ""
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Muu virhe"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8089,80 +8194,80 @@ msgstr "Poistetaan kansiota %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8205,12 +8310,12 @@ msgstr ""
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
 msgstr "L�hetet��n viesti�"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "L�hetet��n viesti�"
@@ -8519,7 +8624,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8577,51 +8682,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8812,7 +8917,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8821,11 +8926,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr ""
 
@@ -8842,7 +8947,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8892,68 +8997,76 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8967,28 +9080,24 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "Etsit��n uusia viestej�"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9005,6 +9114,11 @@ msgstr "V�limuistihakemistoa ei voitu avata: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
@@ -9052,74 +9166,69 @@ msgstr "Salasana"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa k�ytt�en."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Todennus ep�onnistui."
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Kansiota `%s' ei ole olemassa."
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9127,24 +9236,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9218,8 +9327,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9231,7 +9340,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -9245,36 +9354,36 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9295,6 +9404,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9304,12 +9414,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
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9333,7 +9445,8 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9364,7 +9477,7 @@ msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
@@ -9534,40 +9647,45 @@ msgstr "`%s' ei ole hakemisto."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/local/camel-spool-store.c:193
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -9657,48 +9775,48 @@ msgstr "Peruuta"
 msgid "Operation failed: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 #, fuzzy
 msgid "User cancelled"
 msgstr "Peruutettu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viesti� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Tuntematon virhe"
@@ -9957,40 +10075,40 @@ msgstr "V�liaikainen todennusvirhe"
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9998,89 +10116,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Muu virhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10088,76 +10206,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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 tavy"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u tavua"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
@@ -10189,7 +10298,7 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10200,45 +10309,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin l�hetet��n kopio viestist� (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10249,12 +10358,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "_Portti:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kuvaus:"
@@ -10269,7 +10378,7 @@ msgstr "Liit� tiedosto"
 msgid "Could not create a PGP signature context"
 msgstr "Allekirjoitustiedoston luonti ep�onnistui."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10278,48 +10387,48 @@ msgstr ""
 "Tiedoston %s lukeminen ep�onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10328,7 +10437,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10336,34 +10445,56 @@ msgstr ""
 "Ximian Evolution on l�yt�nyt tallentamattomia tiedostoja edelliselt� \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"T�t� viesti� ei ole l�hetetty.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Viestimuokkain -ikkunan luominen ep�onnistui:\n"
+"HTML-muokkainkomponentin k�ynnistys ei onnistunut."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10371,20 +10502,21 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen ep�onnistui:\n"
 "HTML-muokkainkomponentin k�ynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:376
+#: 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:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Evolutionin muokkaimen alustus ei onnistunut."
 
 #: data/evolution.desktop.in.h:1
@@ -10436,8 +10568,8 @@ msgstr "Otsikko sis�lt��"
 msgid "Subject does not contain"
 msgstr "Otsikko ei sis�ll�"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10586,7 +10718,8 @@ msgid "years"
 msgstr "vuotta"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Olet unohtanut valita p�iv�n."
 
 #: filter/filter-datespec.c:269
@@ -10642,13 +10775,12 @@ msgid "Add action"
 msgstr "Lis�� toiminto"
 
 #: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Tyylin nimi:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr ""
 
@@ -10659,7 +10791,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr ""
@@ -10836,225 +10968,229 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sis�lt��"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "L�hetetty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Poistettu"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr ""
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sis�ll�"
+msgid "Draft"
+msgstr "Luonnos"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemassa"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+msgid "Label"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Luonnos"
+msgid "Message Body"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
+msgid "Move to Folder"
+msgstr "Siirr� kansioon"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "L�het� viesti kontaktille"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr "Lue"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "j�lkeen"
+msgid "Replied to"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "ennen"
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurempi kuin"
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
+msgstr "L�hett�j�"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on pienempi kuin"
+msgid "Set Status"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
+#, fuzzy
+msgid "Shell Command"
+msgstr "Yritys"
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "ei ole"
+msgid "Size (kB)"
+msgstr "Koko (kt)"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-msgid "Label"
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Viestin otsikko"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Siirr� kansioon"
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Aihe"
 
 #: filter/libfilter-i18n.h:40
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "L�het� viesti kontaktille"
+msgid "Unset Status"
+msgstr "Yhdysvallat"
 
 #: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Play Sound"
-msgstr "Puola"
+msgid "contains"
+msgstr "sis�lt��"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "Lue"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "ei sis�ll�"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Vastaanottajat"
+msgid "does not end with"
+msgstr "ei lopu merkkijonoon"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr ""
+msgid "does not exist"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burundi"
+msgid "does not sound like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurempi kuin"
+msgid "does not start with"
+msgstr "ei ala merkkijonolla"
 
 #: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "on pienempi kuin"
+msgid "ends with"
+msgstr "loppuu merkkijonoon"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
-msgid "Sender"
-msgstr "L�hett�j�"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr ""
+#, fuzzy
+msgid "is after"
+msgstr "j�lkeen"
 
 #: filter/libfilter-i18n.h:52
 #, fuzzy
-msgid "Shell Command"
-msgstr "Yritys"
+msgid "is before"
+msgstr "ennen"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Koko (kt)"
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr ""
+#, fuzzy
+msgid "is not Flagged"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr ""
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr ""
+#, fuzzy
+msgid "returns less than"
+msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
-msgid "Subject"
-msgstr "Aihe"
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burundi"
 
 #: filter/libfilter-i18n.h:61
-#, fuzzy
-msgid "Unset Status"
-msgstr "Yhdysvallat"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "alkaa merkkijonolla"
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -11090,31 +11226,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Odota, ole hyv�"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr ""
 
@@ -11175,39 +11311,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Roskakori"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11320,106 +11456,117 @@ msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "Julkinen"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Suodata postituslistan mukaan"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Varoitus: Muutettu viesti"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Kirjoita viesti"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Edellinen viesti"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
@@ -11464,141 +11611,141 @@ msgstr "%d l�hett�m�t�nt�"
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
@@ -11670,20 +11817,20 @@ msgstr "Et ole t�ytt�nyt kaikkia tarvittavia kohtia."
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "K�ytt�j�t_unnus:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11700,14 +11847,14 @@ msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "�l� k�yt�"
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "K�yt�"
 
@@ -11788,8 +11935,8 @@ msgstr ""
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
 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 ""
 
 #: mail/mail-callbacks.c:270
@@ -11827,35 +11974,35 @@ msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Sinuun tulee m��ritell� vastaanottajat ennen t�m�n viestin l�hett�mist�."
 
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
 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:1206
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11863,7 +12010,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11871,39 +12018,39 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella l�hett�� kaikki %d viesti� uudelleen?"
 
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 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:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11911,71 +12058,71 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "Kuvaus:"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimet�n kontakti"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "L�het�"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lis�� ehto"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Tallenna allekirjoitus"
@@ -12018,16 +12165,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Tili"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12728,77 +12875,73 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
@@ -12807,148 +12950,144 @@ msgstr "Tallenna kuva nimell�..."
 msgid "Pinging %s"
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
 
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
+
 #: mail/mail-mt.c:257
 #, c-format
 msgid ""
@@ -13181,20 +13320,20 @@ msgstr "Odotetaan..."
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "_Muista t�m� salasana"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
@@ -13204,11 +13343,11 @@ msgstr "Salasana"
 msgid "Could not save signature file: %s"
 msgstr "Allekirjoitustiedoston luonti ep�onnistui."
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13218,11 +13357,12 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
+#: mail/mail-signature-editor.c:372
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -13258,7 +13398,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
 #, fuzzy
 msgid "VFolders"
 msgstr "Kansiot"
@@ -13291,67 +13431,67 @@ msgstr "(Ei aihetta)"
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:736
 msgid "Unseen"
 msgstr "N�hty"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:737
 msgid "Seen"
 msgstr "N�kem�tt�"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:738
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:739
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:741
+#: mail/message-list.c:740
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:744
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:745
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:749
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:750
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13425,45 +13565,70 @@ msgstr "Vastaa kaikille"
 msgid "Review"
 msgstr "Esikatselu:"
 
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Valmis"
+
+#: 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 "Kalenteri"
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Tiedostonimi:"
+
+#: mail/subscribe-dialog.c:229
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Tallenna kansioon..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
@@ -24235,12 +24400,12 @@ msgstr "%A %d %B"
 msgid "No description"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -24250,23 +24415,23 @@ msgstr "Paikalliset kansiot"
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24307,11 +24472,11 @@ msgstr "Kuvaus:"
 msgid "My Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
 #, fuzzy
 msgid "Weather"
 msgstr "S��tiedot"
@@ -25655,6 +25820,11 @@ msgid ""
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "L�hetet��n \"%s\""
+
 #: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
@@ -25874,24 +26044,35 @@ msgid "Rename folder"
 msgstr "Nime� kansio '%s' uudelleen"
 
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:122
 #, 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:288
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Luo _uusi kansio"
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
 msgid "New..."
 msgstr "Uusi..."
 
@@ -25916,122 +26097,112 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#. 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 ""
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
 #, fuzzy
 msgid "Select importer"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "L�hett�j�:"
 
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Tuo"
 
@@ -26057,34 +26228,34 @@ msgstr "Synkronoidaan kansiota"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synkronoidaan kansiota"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Poistetaan kansiota %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "L�hetet��n \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -26124,46 +26295,46 @@ msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Tietoja Evolutionista..."
 
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Luo uusi kontakti"
 
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
 #, fuzzy
 msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
@@ -26171,26 +26342,26 @@ msgstr "Ty�skentele poissa linjoilta"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26203,12 +26374,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26216,19 +26387,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -26367,59 +26538,63 @@ msgstr "Oikotiet"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
 #: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
@@ -26633,7 +26808,7 @@ msgstr ""
 #: shell/glade/evolution-startup-wizard.glade.h:15
 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. "
 msgstr ""
@@ -26649,29 +26824,24 @@ msgstr "Evolutionin asennus"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Assistant"
-msgstr "Evolutionin asennus"
-
-#: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
 msgstr "Valitse tiedosto"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 #, fuzzy
 msgid "Select Importers (step 2 of 3)"
 msgstr "Valitse tiedosto"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 #, fuzzy
 msgid "Select a File (step 2 of 3)"
 msgstr "Valitse tiedosto"
 
-#: 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"
@@ -26892,10 +27062,10 @@ msgstr "Tallenna nykyinen tiedosto"
 #: 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:16
+#: 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:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -27027,7 +27197,7 @@ msgid "Print this item"
 msgstr "Tulosta t�m� kohta"
 
 #: 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:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Tallenna"
 
@@ -27055,7 +27225,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:46
+#: ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -27138,8 +27308,9 @@ msgid "Schedule a meeting for this item"
 msgstr ""
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Tietoja Evolutionista..."
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -27188,29 +27359,30 @@ msgid "Post a message to a Public folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
 #: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Siirr� kansioon..."
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "_Esikatseluruutu:"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr ""
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
@@ -27305,7 +27477,7 @@ msgstr "S�ikeistetty viesti-ikkuna"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Kansio"
 
@@ -27623,7 +27795,8 @@ msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
 #: ui/evolution-mail-message.xml.h:82
@@ -27737,7 +27910,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
 msgstr "T_y�kalut"
 
@@ -27752,12 +27925,12 @@ msgstr "Sulje t�m� ikkuna"
 #: 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:43
+#: ui/evolution.xml.h:46
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
 msgstr "_N�yt�"
 
@@ -27933,7 +28106,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Tallenna luettelo ja sulje ikkuna"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -28104,7 +28277,7 @@ msgid "Open Other _User's Folder..."
 msgstr "Luo _uusi kansio"
 
 #: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:23
@@ -28121,117 +28294,137 @@ msgid "Pi_lot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
 #: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "Luo _uusi kansio"
+
+#: ui/evolution.xml.h:29
 msgid "Send / Receive"
 msgstr "L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "Palvelimen asetukset"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Palvelimen asetukset"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
 msgstr "L�het� virheraportti"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "L�het� _virheraportti"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "L�het� virheraportti k�ytt�en Bug Buddy:a"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "Toggle"
 msgstr "M��rit�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
 msgstr "M��rit�, n�ytet��nk� kansiopalkki"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
 msgstr "M��rit�, n�ytet��nk� oikotiepalkki"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
 msgstr "M��rit�, ty�skennell��nk� poissa linjoilta."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Kansio"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Siirr�..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Preferences..."
-msgstr "_Ominaisuudet..."
+msgid "_Remove Other User's Folder"
+msgstr "Luo _uusi kansio"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
 msgid "_Send / Receive"
 msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Oikotie"
@@ -28478,11 +28671,11 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -28564,6 +28757,35 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
 #, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "Poista"
+
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Lis��"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Etsit��n uusia viestej�"
+
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Kansiota `%s' ei ole olemassa."
+
+#~ msgid "1 byte"
+#~ msgstr "1 tavy"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u tavua"
+
+#, fuzzy
+#~ msgid "Evolution Importer Assistant"
+#~ msgstr "Evolutionin asennus"
+
+#, fuzzy
+#~ msgid "_Preferences..."
+#~ msgstr "_Ominaisuudet..."
+
+#, fuzzy
 #~ msgid "Could not parse query string"
 #~ msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
@@ -28603,15 +28825,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Task Due: <b>"
 #~ msgstr "Valmis"
 
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "T�t� viesti� ei ole l�hetetty.\n"
-#~ "\n"
-#~ "Haluatko tallentaa muutokset?"
-
 #, fuzzy
 #~ msgid "Set as default"
 #~ msgstr " (oletus)"
@@ -28782,14 +28995,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Select a signature script"
 #~ msgstr "Poista kaikki paitsi allekirjoitus"
 
-#, fuzzy
-#~ msgid "Use _HTML for this signature"
-#~ msgstr "_HTML-allekirjoitus:"
-
-#, fuzzy
-#~ msgid "_Filename:"
-#~ msgstr "Tiedostonimi:"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML-allekirjoitus:"
 
@@ -28808,14 +29013,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgstr "Oikea:"
 
 #, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "_Lis��"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "Poista"
-
-#, fuzzy
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Haluatko todella poistaa kansion '%s'?"
 
@@ -29146,9 +29343,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Task..."
 #~ msgstr "_Teht�v�"
 
-#~ msgid "_Mail Settings..."
-#~ msgstr "_S�hk�postiasetukset..."
-
 #, fuzzy
 #~ msgid "Tasks Settings..."
 #~ msgstr "Teht�v�n asetukset"
diff --git a/po/fr.po b/po/fr.po
index ecb59f1b27..639252f849 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0.99\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
 "PO-Revision-Date: 2002-08-25 22:14+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -321,11 +321,17 @@ msgstr "Nom de famille"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Liste de Contacts sans nom"
+
+#: addressbook/backend/ebook/e-card.c:2681
 msgid "Multiple VCards"
 msgstr "Multiples VCards"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
@@ -336,47 +342,47 @@ msgstr "VCard pour %s"
 #: 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/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: 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
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
 msgid "Searching..."
 msgstr "Recherche..."
 
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
 msgid "Loading..."
 msgstr "Chargement"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Connexion au serveur"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur le serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
 msgid "Receiving LDAP search results..."
 msgstr "Récupération des résultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
@@ -393,13 +399,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook non chargé\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
 #: calendar/conduits/todo/todo-conduit.c:889
 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:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
 #: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Ne peut démarrer wombat"
@@ -472,10 +478,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Usine à composants pour l'exemple de composant Carnet d'adresses"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: 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:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contacts"
@@ -492,28 +498,38 @@ msgstr "Serveur LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Serveur LDAP contenant les inforamtions des contacts"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Dossier contenant les informations de contact"
+
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Créer un nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "Contact _List"
 msgstr "_Liste de Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Créer une nouvelle liste de contacts"
@@ -563,7 +579,7 @@ msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser gnome-vfs"
 
@@ -571,11 +587,11 @@ msgstr "Ne peut initialiser gnome-vfs"
 msgid "Other Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -583,7 +599,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:487
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -593,7 +609,7 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses.\n"
 "Vous avez saisi un URI incorrect ou le serveur LDAP est stoppé"
 
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -605,7 +621,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:501
+#: addressbook/gui/component/addressbook.c:504
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -615,37 +631,50 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses.\n"
 "Vous avez saisi un URI incorrect ou le serveur LDAP est stoppé"
 
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"Impossible de vous identifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
 msgid "Name begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
 #, fuzzy
 msgid "Email begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
 msgid "Advanced..."
 msgstr "Avancée..."
 
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -653,7 +682,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
 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"
@@ -661,25 +690,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -746,51 +775,51 @@ msgid "  S_how Supported Bases "
 msgstr "_Vérifier les types supportés"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Options"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "<- Supprimer"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr "666"
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "<- Supprimer"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Options"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -929,50 +958,56 @@ msgstr "Un"
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Please select and Evolution attribute and an\n"
+"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 "Restaurer les valeurs par défaut"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Re_store Defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Domaine de recherche :"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 #: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
 msgid "Searching"
 msgstr "Recherche"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Select"
 msgstr "Sélectionner tout"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Selected:"
 msgstr "Supprimé"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
 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:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -983,7 +1018,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -992,47 +1027,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informations de source"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connexion au serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sous"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schéma non supporté"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1040,7 +1075,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1049,7 +1084,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1057,7 +1092,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1067,7 +1102,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1077,13 +1112,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1093,7 +1128,7 @@ msgstr ""
 "Ceci sera le nombre maximum de carte à télécharger. Si vous spécifiez un "
 "nombre trop élevé, cela ralentira votre carnet d'adresse."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1103,7 +1138,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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1113,7 +1148,7 @@ msgstr ""
 "Ce som sera utilisé pour identifier votre compte (dans un but d'affichage "
 "uniquement)."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1121,11 +1156,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1134,26 +1169,26 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "Using email address"
 msgstr "Adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #: 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
@@ -1161,49 +1196,50 @@ msgstr "Lorsque c'est possible"
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Ajouter -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add ->"
+msgstr "Ajouter ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Ajouter l'action"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Ajouter l'action"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Always"
 msgstr "_Toujours"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Supprimer tout"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Affichage"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:153 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
@@ -1213,102 +1249,102 @@ msgstr "Limite de _téléchargement"
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Éditer le rendez-vous"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarme d'Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Options"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port :"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Racine de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durée du report (minutes)"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "account-druid"
 msgstr "Compte %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "account-editor"
 msgstr "Éditeur de compte"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconnexion à %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 #, fuzzy
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 #, fuzzy
 msgid "searching-tab"
 msgstr "Recherche"
@@ -1325,8 +1361,8 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
@@ -1357,11 +1393,11 @@ msgstr "(%d cachés)"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
 #, fuzzy
 msgid "Find contact in"
 msgstr "L'expéditeur contient"
@@ -1435,7 +1471,7 @@ msgid "D_epartment:"
 msgstr "_Service :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
 msgid "Details"
 msgstr "Détails"
 
@@ -1494,13 +1530,13 @@ 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:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
 #: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -1528,1024 +1564,1024 @@ msgstr "Url du calendrier _public :"
 msgid "_Web page address:"
 msgstr "Adresse page _Web :"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Etats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algérie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "American Samoa"
 msgstr "Samoa (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Andorra"
 msgstr "Andorre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Antarctica"
 msgstr "Antartique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antigua And Barbuda"
 msgstr "Antigua et Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Armenia"
 msgstr "Arménie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Autriche"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahreïn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Barbados"
 msgstr "Barbade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Belarus"
 msgstr "Biélorussie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: 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:153
 msgid "Benin"
 msgstr "Bénin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bermuda"
 msgstr "Bermudes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnie Herzégovine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bouvet Island"
 msgstr "Ile Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brésil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "British Indian Ocean Territory"
 msgstr "Territoire britannique de l'océan Indien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brunei Darussalam"
 msgstr "Brunéi et Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 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:165
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cameroon"
 msgstr "Cameroun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cape Verde"
 msgstr "Cap Vert"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Iles Caïman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Central African Republic"
 msgstr "République Centre-Africaine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Chad"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "China"
 msgstr "Chine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Ile Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cocos (Keeling) Islands"
 msgstr "Iles Cocos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Comoros"
 msgstr "Comores"
 
-#: 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
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cook Islands"
 msgstr "Iles Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croatie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danemark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Dominica"
 msgstr "Dominique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "République Dominicaine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Equateur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 #: 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:196
 msgid "Equatorial Guinea"
 msgstr "Guinée Equatoriale"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Erithrée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Ethiopie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Iles Malouines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Iles Feroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Iles Fidji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "France"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guyane Française"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynésie Francaise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Terres Australes Françaises"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Allemagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grèce"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guaam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatémala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guinea"
 msgstr "Guinée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea-bissau"
 msgstr "Guinée Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #: 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:224
 msgid "Heard And McDonald Islands"
 msgstr "Iles Heard et McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Holy See"
 msgstr "Vatican"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #: 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:227
 #: 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:228
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Inde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Israel"
 msgstr "Israël"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Korea, Republic Of"
 msgstr "Corée (République de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Koweit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kyrgyzstan"
 msgstr "Kyrghiztan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liban"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lithuanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Macau"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Macedonia"
 msgstr "Macédoine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Marshall Islands"
 msgstr "Iles Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mauritius"
 msgstr "Maurice"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Micronesia"
 msgstr "Micronésie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Moldova, Republic Of"
 msgstr "Moldavie (Républiqe de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Namibia"
 msgstr "Nanibie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Nepal"
 msgstr "Népal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Netherlands Antilles"
 msgstr "Antilles Néerlandaises"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nouvelle Zélande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 #: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Ile Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Northern Mariana Islands"
 msgstr "Iles Marianes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvège"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Palestinian Territory"
 msgstr "Territoire paléstinien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 #: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guinée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 #: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 #: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Pérou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Philippines"
 msgstr "Philippines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 #: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Pologne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 #: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 #: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Prto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 #: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Quatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Reunion"
 msgstr "La Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Roumanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Russian Federation"
 msgstr "Russie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts et Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Saint Lucia"
 msgstr "Sainte Lucie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent et Les Grenadines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "San Marino"
 msgstr "San Marin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Sao Tome And Principe"
 msgstr "Säo Tome et Pricipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Senegal"
 msgstr "Sénégal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 #: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapour"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 #: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Solomon Islands"
 msgstr "Iles Salomon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Somalia"
 msgstr "Somalie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgie du Sud et Iles Sandwitch"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "St. Helena"
 msgstr "St Hélène"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "St. Pierre And Miquelon"
 msgstr "St Pierre et Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Sudan"
 msgstr "Soudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Iles Jan Mayen et Spitzberg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 #: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suède"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 #: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanie (République Unie de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Thailand"
 msgstr "Thailande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Trinidad And Tobago"
 msgstr "Trinidad et Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turquie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Turks And Caicos Islands"
 msgstr "Iles Turks et Caïques"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United Arab Emirates"
 msgstr "Emirats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Grande Bretagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "United States Minor Outlying Islands"
 msgstr "Iles isolées (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uzbekistan"
 msgstr "Uzbékistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 #: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Vénézuéla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Virgin Islands, British"
 msgstr "Iles Vierges (Anglaises)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Virgin Islands, U.S."
 msgstr "Iles Vierges (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Wallis And Futuna Islands"
 msgstr "Iles Wallis et Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 #: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yémen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yougoslavie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Zambia"
 msgstr "Zambie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
@@ -2582,20 +2618,20 @@ msgstr "TTY/TDD"
 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:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Éditer entièrement"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -2617,6 +2653,19 @@ msgstr ""
 "%s existe déjà\n"
 "Voulez vous l'écraser ?"
 
+#: 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
+#, fuzzy
+msgid "Overwrite"
+msgstr "Écraser le fichier ?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2 :"
@@ -2749,7 +2798,7 @@ msgstr "Éditeur de liste de contacts"
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
 msgid "Save List as VCard"
 msgstr "Enregistrer la liste comme VCard"
 
@@ -2799,7 +2848,7 @@ msgstr ""
 "dans ce dossier. Voulez vous quand même l'ajouter ?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -2808,24 +2857,24 @@ msgstr "Recherche avancée"
 msgid "Search"
 msgstr "Rechercher"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No cards"
 msgstr "Pas de cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "1 card"
 msgstr "1 carte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
 #, c-format
 msgid "%d cards"
 msgstr "%d cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
@@ -2837,10 +2886,10 @@ msgid "Success"
 msgstr "Succès"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2848,7 +2897,7 @@ msgstr "Erreur inconnue"
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permission refusée"
@@ -2869,8 +2918,8 @@ msgstr "Protocole non supporté"
 #: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
 msgid "Cancelled"
 msgstr "Annulée"
 
@@ -2921,7 +2970,7 @@ msgstr "Suppression de liste : Erreur"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
@@ -2934,11 +2983,10 @@ msgid "Display Cards"
 msgstr "Afficher les cartes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:213
-#, c-format
+#, 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 ""
 "Vous avez demander à ce que %d cartes soit affichées. Cette opération va "
 "ouvrir\n"
@@ -3027,7 +3075,7 @@ msgstr "Carnet d'adresses"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
@@ -3109,7 +3157,7 @@ msgstr "Copier"
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
 #: 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
@@ -3117,8 +3165,8 @@ msgstr "Coller"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 msgid "Current View"
 msgstr "Vue courante"
 
@@ -3126,7 +3174,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 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"
 
@@ -3134,11 +3182,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3270,7 +3318,7 @@ msgid "Include:"
 msgstr "Inclure :"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Paysage"
 
@@ -3295,7 +3343,7 @@ msgid "Options"
 msgstr "Options"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientation"
 
@@ -3318,7 +3366,7 @@ msgstr "Source  papier :"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portrait"
 
@@ -3380,20 +3428,20 @@ msgstr "Rendez-vous sans titre"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
 msgid "High"
 msgstr "Haute"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
 msgid "Low"
 msgstr "Basse"
 
@@ -3404,13 +3452,17 @@ msgstr "Basse"
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: 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
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les données du block Calendrier du Pilot"
 
@@ -3519,11 +3571,11 @@ msgstr "Durée du report (minutes)"
 msgid "_Edit appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3536,13 +3588,13 @@ msgstr ""
 "un courrier. Evolution affichera une fenêtre \n"
 "d'avertissement classique à la place."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3559,15 +3611,15 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
 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:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer l'usine à services de notification d'alarme"
 
@@ -3616,7 +3668,7 @@ msgstr "%A %d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3695,9 +3747,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 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:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3714,13 +3766,13 @@ msgid "Assigned"
 msgstr "Attribué"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Oui"
 
 #: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Non"
 
@@ -3740,77 +3792,97 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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 "Calendrier"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
 msgid "Folder containing appointments and events"
 msgstr "Dossier contenant des rendez-vous et des événements"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Url du calendrier _public :"
+
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Dossier contenant des rendez-vous et des événements"
+
+#: 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:311
 #: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tâches"
 
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
 msgid "Folder containing to-do items"
 msgstr "Dossier contenant des éléments « À Faire »"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimer les tâches"
+
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Dossier contenant des éléments « À Faire »"
+
+#: calendar/gui/component-factory.c:735
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Supprimer le rendez-vous"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
 msgid "_Meeting"
 msgstr "Ré_union"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Créer un nouveau raccourci"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
 #, fuzzy
 msgid "Create a new task"
 msgstr "Créer un nouveau contact « %s »"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "New All Day Appointment"
 msgstr "Nouveau rendez-vous quotidien"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Nouveau rendez-vous quotidien"
@@ -3853,30 +3925,31 @@ msgid "Alarm Repeat"
 msgstr "Répétition Alarme"
 
 #: 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 ""
+"Ceci est sensé être un pense-bête par email, mais Evolution ne supporte "
+"pas \n"
+"encore ce type de pense-bête. Vous ne pourrez pas éditer ses options."
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Message à afficher"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Jouer le son : "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Répéter l'alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Lancer le programme :"
 
-#: 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 ""
-"Ceci est sensé être un pense-bête par email, mais Evolution ne supporte "
-"pas \n"
-"encore ce type de pense-bête. Vous ne pourrez pas éditer ses options."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Avec ces arguments :"
@@ -3900,110 +3973,110 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d days"
 msgstr "%d jours"
 
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
 msgid "1 day"
 msgstr "1 jour"
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
 #, c-format
 msgid "%d weeks"
 msgstr "%d semaines"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
 msgid "1 week"
 msgstr "1 semaine"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
 #, c-format
 msgid "%d hours"
 msgstr "%d heures"
 
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
 msgid "1 hour"
 msgstr "1 heure"
 
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
 msgid "1 minute"
 msgstr "1 minute"
 
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Émettre un son"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Afficher un message"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Send an email"
 msgstr "Envoyer un E-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Lancer un programme"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
 msgid "Unknown action to be performed"
 msgstr "Action inconnue à exécuter"
 
-#: 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 avant le début du rendez-vous"
 
-#: 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 après le début du rendez-vous"
 
-#: 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 au début du rendez-vous"
 
-#: 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 avant la fin du rendez-vous"
 
-#: 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 après la fin du rendez-vous"
 
-#: 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 à la fin du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
 #, c-format
 msgid "%s at %s"
 msgstr "%s à %s"
 
-#: 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 pour un type d'activation inconnu"
@@ -4024,7 +4097,7 @@ msgstr "Rappels"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -4107,7 +4180,7 @@ msgid "Days"
 msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -4120,7 +4193,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Monday"
 msgstr "Lundi"
 
@@ -4130,7 +4203,7 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -4143,7 +4216,7 @@ 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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -4161,7 +4234,7 @@ msgid "Task List"
 msgstr "Liste des tâches"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -4178,7 +4251,7 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -4187,7 +4260,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -4415,8 +4488,8 @@ msgid "No summary"
 msgstr "Aucun résumé"
 
 #: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
@@ -4485,27 +4558,27 @@ msgstr "Délégué À :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
 msgid "Reminder"
 msgstr "Rappeler"
 
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
 msgid "Scheduling"
 msgstr "Programme"
 
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Réunion"
 
@@ -4574,19 +4647,19 @@ 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:414
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
 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:594
 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:669
 msgid "_Delegate To..."
 msgstr "_Délégué à..."
 
@@ -4626,7 +4699,7 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
@@ -4638,7 +4711,7 @@ msgstr "Rôle"
 
 #: 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:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4711,43 +4784,43 @@ msgstr "ième"
 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:997
+#: calendar/gui/dialogs/recurrence-page.c:999
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
 msgid "first"
 msgstr "premier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
 msgid "second"
 msgstr "seconde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
 msgid "third"
 msgstr "troisième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
 msgid "fourth"
 msgstr "quatrième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
 msgid "last"
 msgstr "dernier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "Other Date"
 msgstr "Autre date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
 msgid "occurrences"
 msgstr "récurrences"
 
@@ -4841,7 +4914,7 @@ msgstr "Date d'achèvement :"
 
 #: 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:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
@@ -4850,7 +4923,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL :"
 
@@ -4862,17 +4935,17 @@ msgstr "_Priorité :"
 msgid "_Status:"
 msgstr "_État :"
 
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
 msgid "Basic"
 msgstr "Basique"
 
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4942,12 +5015,12 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ouvrir"
@@ -4956,30 +5029,30 @@ msgstr "Ouvrir"
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
 #: 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:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 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:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 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:995 calendar/gui/e-day-view.c:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 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"
@@ -5005,12 +5078,12 @@ msgstr "_Marquer les tâches comme terminées"
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -5019,8 +5092,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:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5049,7 +5122,7 @@ 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:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
 #: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Résumé"
@@ -5116,117 +5189,117 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
 msgid "New All Day _Event"
 msgstr "Nouvel évènement de journée complète"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
 msgid "_Go to Date..."
 msgstr "Aller à la date"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
 msgid "_Configure..."
 msgstr "_Configurer..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
 msgid "_Configure Pilot..."
 msgstr "_Configurer le Pilot..."
 
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence déplaçable"
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
 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."
 
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Finit : <b>"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminé "
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5235,329 +5308,335 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Location:"
 msgstr "_Lieu :"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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:500
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
 msgid "Tentatively Accepted"
 msgstr "Accepté pour voir"
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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:506 calendar/gui/itip-utils.c:532
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
 #: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
 msgid "Update"
 msgstr "Mise à jour"
 
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
 msgid "Tentatively accept"
 msgstr "Accepter pour voir"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
 msgid "Update respondent status"
 msgstr "Mettre à jour le status de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
 #, 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:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
 #, 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:1044
+#: calendar/gui/e-itip-control.c:1051
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
 #, 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:1049
+#: calendar/gui/e-itip-control.c:1056
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
 #, 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:1054
+#: calendar/gui/e-itip-control.c:1061
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
 #, 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:1062
+#: calendar/gui/e-itip-control.c:1069
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
 #, 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:1070
+#: calendar/gui/e-itip-control.c:1077
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
 #, 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:1078
+#: calendar/gui/e-itip-control.c:1085
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
 #, 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:1100
+#: calendar/gui/e-itip-control.c:1107
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
 #, 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:1105
+#: calendar/gui/e-itip-control.c:1112
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1117
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1122
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, 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:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Task Reply"
 msgstr "Répondre à la tâche"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
 #, 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:1131
+#: calendar/gui/e-itip-control.c:1138
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
 #, 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:1159
+#: calendar/gui/e-itip-control.c:1166
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
 #, 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:1164
+#: calendar/gui/e-itip-control.c:1171
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1176
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 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:1248
+#: calendar/gui/e-itip-control.c:1298
 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:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
 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:1307
+#: calendar/gui/e-itip-control.c:1357
 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:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
 #, 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:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
 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:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
 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:1523
+#: calendar/gui/e-itip-control.c:1573
 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:1535
+#: calendar/gui/e-itip-control.c:1585
 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:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Ne peut ouvrir le dossier dans « %s »"
+
+#: calendar/gui/e-itip-control.c:1612
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
 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:1600
+#: calendar/gui/e-itip-control.c:1650
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Sélectionnez un Dossier"
@@ -5603,7 +5682,7 @@ msgstr "date de début"
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
 msgid "Required Participants"
 msgstr "Participants demandés"
 
@@ -5617,52 +5696,52 @@ msgid "Resources"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
 msgid "Individual"
 msgstr "Individuel"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
 msgid "Group"
 msgstr "Groupe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
 msgid "Resource"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
 msgid "Room"
 msgstr "Salle"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
 msgid "Chair"
 msgstr "Président"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
 msgid "Required Participant"
 msgstr "Participant exigé"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
 msgid "Non-Participant"
 msgstr "Non participant"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Provisoire"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
 msgid "Delegated"
 msgstr "Délégué"
 
@@ -5752,42 +5831,49 @@ msgstr "Heure de _début de la réunion :"
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la réunion :"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, 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:393
 #, 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:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "Erreur au lancement de %s"
+
+#: calendar/gui/e-tasks.c:540
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Date d'Achèvement"
 
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
@@ -5801,7 +5887,13 @@ msgstr "Ne peut ouvrir le dossier dans « %s »"
 msgid "The method required to open `%s' is not supported"
 msgstr "La méthode requise pour ouvrir « %s » n'est pas supportée"
 
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarme du %s"
+
+#: calendar/gui/gnome-cal.c:1761
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5809,7 +5901,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5817,12 +5909,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
 
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ouverture du dossier %s"
@@ -5883,47 +5975,57 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "Au moins un participant est nécessaire"
-
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "Au moins un participant est nécessaire"
+
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
 msgid "Event information"
 msgstr "Information événement"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
 msgid "Calendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, fuzzy, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Information Libre-Occupé"
+
+#: calendar/gui/itip-utils.c:608
+#, fuzzy
+msgid "iCalendar information"
+msgstr "Information calendrier"
+
+#: calendar/gui/itip-utils.c:766
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
@@ -6159,7 +6261,7 @@ msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Aperçu Avant Impression"
@@ -6183,7 +6285,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "Les URI du dossier des tâches à afficher"
 
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6195,12 +6297,12 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
@@ -6270,15 +6372,15 @@ msgstr ""
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
 msgid "Reminder!!"
 msgstr "Rappel !!"
 
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
 msgid "Calendar Events"
 msgstr "Évenements Calendrier"
 
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6286,94 +6388,94 @@ msgstr ""
 "Evolution a trouvé des fichiers Gnome Calendar.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
 msgid "Gnome Calendar"
 msgstr "Calendrier Gnome"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now attend 0 argument"
 
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time attend 1 argument"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time attend une chaîne de caractères pour l'argument 1"
 
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time attend une chaîne de date ISO 8601 pour l'argument 1"
 
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add attend 2 arguments"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add attend un entier pour l'argument 2"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin attend 1 argument"
 
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time_day-end attend 1 argument"
 
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype attend 0 argument"
 
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "Occur-in-time-range ? attend 2 arguments"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 2"
 
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains ? attend 2 arguments"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 1"
 
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 2"
 
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains ? attend « any », « summary », « description » pour l'argument 1"
 
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories ? attend au moins 1 argument"
 
-#: calendar/pcs/query.c:754
+#: 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)"
@@ -6381,22 +6483,27 @@ msgstr ""
 "has-categories ? attend tous les arguments comme chaîne ou seulement 1 "
 "argument comme booléen faux (#f)"
 
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed ? attend 0 argument"
 
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before. attend 1 argument"
 
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? attends un t_time comme premier argument"
 
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "L'évaluation de l'expression de recherche ne produit pas un booléen"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Autre Erreur"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7990,81 +8097,81 @@ msgstr "Ecriture du dossier « %s »"
 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:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier de spool"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
 msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Échec de la récupération du message"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Arguments invalides"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Arguments invalides"
 
-#: camel/camel-filter-search.c:511
+#: 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:547
+#: 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:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
@@ -8111,11 +8218,11 @@ msgstr "Opération non-supportée : recherche par expression : pour %s"
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opération non-supportée : recherche par uids : pour %s"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copie des messages vers %s"
@@ -8446,7 +8553,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'identification du serveur."
 
@@ -8504,52 +8611,52 @@ msgstr "POP avant authentification SMTP utilisant une source non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Échec de compilation d'expression régulière : %s : %s"
 
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL « %s » nécessite un  « nom d'utilisateur »"
 
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL « %s »  nécessite un composant  « Host »"
 
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL « %s » nécessite un chemin"
 
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
 #, c-format
 msgid "Resolving: %s"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Échec de la résolution du nom : %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
 #, 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é"
 
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
 
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Échec de la résolution de l'hôte : %s : hôte non trouvé"
 
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
@@ -8749,7 +8856,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8762,11 +8869,11 @@ msgstr ""
 "Empreinte  :        %s\n"
 "Signature  :        %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
 msgid "BAD"
 msgstr "MAUVAIS"
 
@@ -8788,7 +8895,7 @@ msgstr ""
 "Désirez-vous accepter quand même ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8843,68 +8950,76 @@ msgstr "Impossible de renommer le dossier : %s : Opération invalide"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
 
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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:2641
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
 
-#: camel/providers/imap/camel-imap-command.c:385
+#. 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 "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Réponse inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
 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:642
+#: camel/providers/imap/camel-imap-command.c:652
 #, 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:678
+#: camel/providers/imap/camel-imap-command.c:688
 #, 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:220
+#: camel/providers/imap/camel-imap-folder.c:221
 #, 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:239
+#: camel/providers/imap/camel-imap-folder.c:240
 #, 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:305
+#: camel/providers/imap/camel-imap-folder.c:306
 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:547
+#: camel/providers/imap/camel-imap-folder.c:548
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Échec de la récupération du message"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -8920,28 +9035,24 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
 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:2090
-msgid "Scanning for new messages"
-msgstr "Examen des nouveaux messages"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 
@@ -8958,6 +9069,11 @@ msgstr "Ne peut ouvrir le répertoire de cache : %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Vérification si nouveau courrier"
@@ -9006,74 +9122,69 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Connexion annulée"
 
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée"
 
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr " Échec des négociations SSL"
 
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "Le dossier n'est pas vide"
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
 #, 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:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
 #, 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:1108
+#: camel/providers/imap/camel-imap-store.c:1121
 #, 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:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9084,24 +9195,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Le nom de dossier ne peut contenir le caractère RC"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers"
 
@@ -9182,8 +9293,8 @@ msgid ""
 msgstr "Pour stocker le courrier local dans des fichiers au format mbox"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
@@ -9195,7 +9306,7 @@ msgstr "La racine de stockage %s n'est pas un répertoire habituel"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le répertoire : %s : %s"
@@ -9209,32 +9320,32 @@ 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:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s"
 
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
 #, 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:390
+#: camel/providers/local/camel-local-store.c:394
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Impossible d'enregistrer le résumé : %s : %s"
 
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au résumé : raison inconnue"
 
@@ -9254,6 +9365,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
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9265,12 +9377,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
 #, 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:168
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9296,7 +9410,8 @@ msgid "not a maildir directory"
 msgstr "n'est pas un répertoire maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossible de scruter le dossier « %s » : %s"
@@ -9324,7 +9439,7 @@ msgid "Storing folder"
 msgstr "Ecriture du dossier"
 
 #: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossible de créer le verrou sur le dossier %s : %s"
@@ -9496,40 +9611,45 @@ 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:116
+#: camel/providers/local/camel-spool-store.c:118
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "La racine de stockage %s n'est pas un répertoire habituel"
 
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Le dossier « %s/%s » n'existe pas."
 
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "« %s » n'est pas un fichier normal."
+
+#: camel/providers/local/camel-spool-store.c:193
 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:174
+#: camel/providers/local/camel-spool-store.c:205
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent être effacés."
 
@@ -9624,47 +9744,47 @@ msgstr "Utilisez annuler"
 msgid "Operation failed: %s"
 msgstr "Opération échouée : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Récupération résumé POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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
 msgid "User cancelled"
 msgstr "Opération annulée"
 
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Impossible d'optenir le résumé POP : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
 msgid "Expunging deleted messages"
 msgstr "Nettoyer les messages supprimés"
 
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec 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:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Récupération du message POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: 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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Impossible d'obtenir le message : %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -9937,41 +10057,41 @@ msgstr "Anomalie authentification temporaire"
 msgid "Authentication required"
 msgstr "Identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Erreur réponse QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
 msgid "server does not appear to support SSL"
 msgstr "le serveur ne semble pas supporter SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Requête STARTTLS expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
 msgstr "Erreur de réponse STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
 #, fuzzy, 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:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9982,89 +10102,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
 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:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
 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:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Erreur création objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Erreur réponse MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Echec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -10072,76 +10192,67 @@ 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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
 msgstr "Erreur réponse DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, 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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "Erreur réponse de fin de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Erreur réponse QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 octet"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u octets"
-
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
 msgid "attachment"
 msgstr "pièce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
 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:554
+#: composer/e-msg-composer-attachment-bar.c:547
 msgid "Add attachment..."
 msgstr "Ajouter une pièce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
@@ -10174,7 +10285,7 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -10185,45 +10296,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:382
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Reply-To:"
 msgstr "Répondre-à :"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
 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:421
+#: composer/e-msg-composer-hdrs.c:438
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10234,12 +10345,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
 #, fuzzy
 msgid "Posting destination"
 msgstr "Pas de description"
@@ -10254,7 +10365,7 @@ msgstr "Joindre un fichier"
 msgid "Could not create a PGP signature context"
 msgstr "Ne peut créer un contexte de signature PGP."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10263,34 +10374,34 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
 msgid "Warning!"
 msgstr "Avertissement !"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut récupérer le message de l'éditeur"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10299,7 +10410,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10308,7 +10419,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10317,7 +10428,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10325,28 +10436,39 @@ 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:1530
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Ce message n'a pas été envoyé.\n"
+"\n"
+"Voulez-vous enregistrer vos changements ?"
+
+#: composer/e-msg-composer.c:1536
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifié"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
 #, fuzzy
 msgid "Signature:"
 msgstr "Signature"
 
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10354,7 +10476,18 @@ 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:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Impossible de créer la fenêtre de composition :\n"
+"Ne peut activer le composant « Editeur HTML »."
+
+#: composer/e-msg-composer.c:2879
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10362,7 +10495,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "Ne peut activer le composant « Editeur HTML »."
 
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
 #, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
@@ -10371,7 +10504,7 @@ msgstr ""
 "<b>(L'éditeur contient un corps de message non textuel, qui ne peut être "
 "édité)<b>"
 
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -10379,8 +10512,9 @@ 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:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
 #: data/evolution.desktop.in.h:1
@@ -10431,8 +10565,8 @@ 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:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10580,7 +10714,8 @@ msgid "years"
 msgstr "années"
 
 #: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
 msgstr "Vous avez oublié de choisir une date."
 
 #: filter/filter-datespec.c:269
@@ -10636,16 +10771,12 @@ msgid "Add action"
 msgstr "Ajouter l'action"
 
 #: filter/filter-folder.c:149
-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."
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Spécifiez le nom de fichier : "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
 msgid "Select Folder"
 msgstr "Sélectionnez un Dossier"
 
@@ -10658,7 +10789,7 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
 #: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Important"
@@ -10841,222 +10972,226 @@ 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:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Date de réception"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne contient pas"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ne finit pas par"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "n'existe pas"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "n'existe pas"
-
-#: 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
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "N'existe pas"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Brouillon"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "finit par"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "est"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "est aprés"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "est avant"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "est Marqué"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "est plus grand que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "est inférieur à"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "n'est pas"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "n'est pas Marqué"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
 msgid "Label"
 msgstr "Étiquette"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Liste de diffusion"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "En-tête du message"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exécuter la commande "
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 msgid "Play Sound"
 msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regex correspond"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Répondu à"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "est plus grand que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "est inférieur à"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
 msgid "Set Status"
 msgstr "Définir l'état"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exécuter la commande "
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
 msgid "Size (kB)"
 msgstr "Taille (ko)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "ressemble à"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
 msgid "Source Account"
 msgstr "Compte source"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "En-tête spécifique"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "Débute par"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Arrête le traitement"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Définir l'état"
 
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "ne finit pas par"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "ne ressemble pas à"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "finit par"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "est Marqué"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "est aprés"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "est avant"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "est plus grand que"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "est inférieur à"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not Flagged"
+msgstr "n'est pas Marqué"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "n'est pas"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "est"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "est plus grand que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "est inférieur à"
+
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "ressemble à"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "Débute par"
+
 #: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Règles"
@@ -11090,31 +11225,31 @@ msgstr "Vous devez spécifier au moins un dossier comme source."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importation..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Veuillez attendre"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importation de %s comme %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: 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:339
+#: mail/folder-browser-ui.c:353
 msgid "Mail"
 msgstr "Courrier"
 
@@ -11175,39 +11310,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
 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:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Corbeille"
 
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fichier de courrier local %s"
 
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scrutation du répertoire"
 
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
 msgid "Starting import"
 msgstr "Début importation :"
 
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
 msgid "Settings"
 msgstr "Réglages"
 
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Éditer les Filtres"
 
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11320,26 +11455,36 @@ msgid "Folder containing mail"
 msgstr "Dossier contenant du courrier"
 
 #: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "_Public"
+
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Dossier contenant du courrier"
+
+#: mail/component-factory.c:104
 msgid "Virtual Trash"
 msgstr "Corbeille Virtuelle"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
 msgid "Virtual Trash folder"
 msgstr "Dossier de corbeille Virtuelle"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
 msgid "This folder cannot contain messages."
 msgstr "Ce dossier ne peut contenir de messages."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
 msgid "Change this folder's properties"
 msgstr "Modifier les propriétés de ce dossier"
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11347,79 +11492,80 @@ msgstr ""
 "Certains de vos règlages de messagerie semblent corrompus, vérifiez que tout "
 "est en ordre."
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
 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:972
+#: mail/component-factory.c:992
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Avertissement : Message modifié"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "New Mail Message"
 msgstr "Nouveau message électronique"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
 msgid "_Mail Message"
 msgstr "_Message électronique"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Composer un message"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "New Message Post"
 msgstr "Message _suivant"
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
 #, fuzzy
 msgid "_Post Message"
 msgstr "Message _précédent"
 
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nouveau message électronique"
 
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Ne peut initialiser le composant de configuration de messagerie d'Evolution."
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Impossible d'initialiser le composant d'information des dossiers d'Evolution"
 
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriétés de « %s »"
 
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
 msgid "Properties"
 msgstr "Propriétés"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut créer de répertoire temporaire : %s"
@@ -11464,129 +11610,129 @@ msgstr "%d envoyés"
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
@@ -11659,20 +11805,20 @@ msgstr "Vous n'avez pas saisi toutes les informations requises."
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'_utilisateur :"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
 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."
 
@@ -11689,14 +11835,14 @@ msgid "Really delete account?"
 msgstr "Effacer réellement le compte ?"
 
 #: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
 msgid "Disable"
 msgstr "Désactiver."
 
 #: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
 msgid "Enable"
 msgstr "Activer"
 
@@ -11783,9 +11929,10 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
+#, 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 ""
 "Vous êtes sur le point d'envoyer un courrier au format HTML, mais les "
 "déstinataires suivants ne veulent pas de ce format :\n"
@@ -11829,7 +11976,7 @@ 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:776
+#: mail/mail-callbacks.c:777
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11837,28 +11984,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:1181
+#: mail/mail-callbacks.c:1206
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
 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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
 #, 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:2378
+#: mail/mail-callbacks.c:2405
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11866,7 +12013,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11874,32 +12021,32 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
 #, 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:2457
+#: mail/mail-callbacks.c:2484
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
 msgid "Go to next folder with unread messages?"
 msgstr "Aller au dossier suivant conntenant des messages non lus ?"
 
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11907,7 +12054,7 @@ msgstr ""
 "Il n'y a plus de nouveau messages dans ce dossier.\n"
 "Voulez-vous aller au dossier suivant ?"
 
-#: mail/mail-callbacks.c:2877
+#: mail/mail-callbacks.c:2904
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11919,7 +12066,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11928,35 +12075,35 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
 #, 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:220
+#: mail/mail-composer-prefs.c:223
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -11965,31 +12112,31 @@ msgstr ""
 "dans la section avancée de la configuration\n"
 "des signatures."
 
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
 #, fuzzy
 msgid " [script]"
 msgstr "_Script"
 
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
 #, fuzzy
 msgid "en"
 msgstr "Envoyer"
 
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
 #, fuzzy
 msgid "Add script signature"
 msgstr "Ajouter une nouvelle signature"
 
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
 #, fuzzy
 msgid "Add Signature"
 msgstr "Signature"
@@ -12052,16 +12199,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Compte"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
@@ -12764,78 +12911,74 @@ 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:319
+#: mail/mail-display.c:321
 msgid "Save Attachment"
 msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ne peut créer le fichier temporaire : « %s » : %s"
 
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
 #, fuzzy
 msgid "Downloading images"
 msgstr "Chargement des images"
 
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tâches en _retard :"
 
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %H:%M"
 
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -12844,107 +12987,108 @@ msgstr "Enregistrer l'image sous..."
 msgid "Pinging %s"
 msgstr "Scrutation de %s"
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
 #, c-format
 msgid "%s attachment"
 msgstr "pièce-jointe %s"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "Répondre-À :"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
 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:1867
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ne peut créer un contexte de vérification PGP."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
 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:1884
+#: mail/mail-format.c:1878
 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:2134
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
 #, 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:2153
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Dossiers locaux"
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -12953,27 +13097,22 @@ msgstr ""
 "Ne peut enregistrer les méta-informations du dossier; vous \n"
 "n'allez probablement plus pouvoir ouvrir ce dossier : %s : %s"
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
 #, 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:861
+#: mail/mail-local.c:860
 #, 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:1326
+#: 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:1341
-#, c-format
-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."
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12981,15 +13120,15 @@ 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:1452
-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-local.c:1461
+#: mail/mail-local.c:1446
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
 
+#: mail/mail-local.c:1510
+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:257
 #, c-format
 msgid ""
@@ -13230,21 +13369,21 @@ msgstr "Attente..."
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé la requête"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
 msgid "_Remember this password"
 msgstr "Se _souvenir du mot de passe"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
 
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
@@ -13253,11 +13392,11 @@ msgstr "Saisissez le mot de passe"
 msgid "Could not save signature file: %s"
 msgstr "Ne peut enregistrer le fichier de signature : %s"
 
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13267,14 +13406,12 @@ msgstr ""